--- elwix/config/rc.3thparty_helper	2016/11/03 13:41:37	1.2.2.1
+++ elwix/config/rc.3thparty_helper	2021/03/17 20:30:44	1.4.2.1
@@ -4,7 +4,7 @@
 #
 # ./rc.3thparty_helper [package] [make_tool] [prefix_dir] [build_arch_str]
 #
-# $Id: rc.3thparty_helper,v 1.2.2.1 2016/11/03 13:41:37 misho Exp $
+# $Id: rc.3thparty_helper,v 1.4.2.1 2021/03/17 20:30:44 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -20,12 +20,12 @@ CMD=$1
 MK=${2:-make}
 P=${3:-/tmp/elwix}
 B=$4
-PFX="--prefix ${P}"
+PFX="--prefix=${P}"
 shift; shift; shift; shift;
 echo ">>> Working script ${MK} into ${PFX}"
 
 if [ -n "${B}" ]; then
-	PFX="${PFX} --build ${B}"
+	PFX="${PFX} --host=${B}"
 fi
 
 TOP=$(pwd)
@@ -85,12 +85,20 @@ case $CMD in
 		;;
 	readline)
 		cd ${ADDSRC}/readline
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	confuse)
+		cd ${ADDSRC}/confuse
+		${CEXEC} INSTALL="/usr/bin/install" ./configure --disable-nls --enable-shared ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	mpd)
 #		cd ${ADDSRC}/libpdel
 #		${MK} clean || exit 1
@@ -98,9 +106,9 @@ case $CMD in
 #		find . -name \*.so\* -type f -exec install {} ${P}/lib \;
 #		cd ..
 		cd ${ADDSRC}/mpd/src
-		./configure
-		${MK} clean || exit 1
-		${MK} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" DESTDIR=${WORLD} ./configure
+		${MK} DESTDIR=${WORLD} clean || exit 1
+		${MK} DESTDIR=${WORLD} || exit 1
 		install mpd5 ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
@@ -135,7 +143,7 @@ case $CMD in
 		;;
 	iperf)
 		cd ${ADDSRC}/iperf
-		./configure --disable-silent-rules ${PFX} || exit 1
+		./configure --without-openssl ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -149,6 +157,39 @@ case $CMD in
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	curl)
+		cd ${ADDSRC}/curl
+		./configure --sysconfdir=/etc --disable-werror --enable-alt-svc --without-brotli --disable-ares --enable-cookies \
+			--disable-curldebug --disable-debug --enable-dict --enable-ftp --without-gnutls --enable-gopher \
+			--without-gssapi --enable-http --with-nghttp2 --without-libidn2 --enable-imap --enable-ipv6 \
+			--disable-ldap --disable-ldaps --without-libssh2 --without-libmetalink --without-nss --with-ssl=/usr \
+			--enable-pop3 --enable-proxy --without-libpsl --without-librtmp --enable-rtsp --disable-smb \
+			--enable-smtp --enable-telnet --enable-tftp --enable-pthreads --enable-threaded-resolver \
+			--enable-tls-srp --without-wolfssl --disable-silent-rules ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	strongswan)
+		cd ${ADDSRC}/strongswan
+		./configure --sysconfdir=/etc/strongswan --enable-kernel-pfkey --enable-kernel-pfroute --disable-kernel-netlink \
+			--disable-scripts --disable-gmp --enable-openssl --enable-eap-identity --enable-eap-md5 \
+			--enable-eap-tls --enable-eap-mschapv2 --enable-eap-peap --enable-eap-ttls --enable-md4 \
+			--enable-blowfish --enable-addrblock --enable-whitelist --enable-cmd --with-group=wheel \
+			--with-printf-hooks=builtin --enable-curl --disable-scepclient --enable-swanctl --enable-vici \
+			--disable-silent-rules --with-ipsecdir=/usr/pkg/libexec/ipsec --with-ipseclibdir=/usr/pkg/lib/ipsec \
+			${PFX} || exit 1
+		aclocal
+		automake
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		mv -v /usr/pkg/libexec/ipsec ${P}/libexec
+		mv -v /usr/pkg/lib/ipsec ${P}/lib
+		rm -rf /usr/pkg
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	ipsec-tools)
 		cd ${ADDSRC}/ipsec-tools
 		./configure --enable-shared --sysconfdir=/etc/racoon --localstatedir=/var/run --with-pkgversion=elwix-0.8.2 \
@@ -192,7 +233,7 @@ case $CMD in
 		;;
 	igmpproxy)
 		cd ${ADDSRC}/igmpproxy
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -200,7 +241,8 @@ case $CMD in
 		;;
 	bmon)
 		cd ${ADDSRC}/bmon
-		./configure ${PFX} || exit 1
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" \
+			./configure --without-ncursesw --disable-asound --disable-rrd --disable-dbi ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -216,7 +258,7 @@ case $CMD in
 		;;
 	libnet)
 		cd ${ADDSRC}/libnet
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -224,8 +266,8 @@ case $CMD in
 		;;
 	arping)
 		cd ${ADDSRC}/arping
-		env LDFLAGS=-L${ADDSRC}/libnet/src CFLAGS=-I${ADDSRC}/libnet/include \
-			./configure ${PFX} || exit 1
+#		${CEXEC} LDFLAGS=-L${ADDSRC}/libnet/src CFLAGS=-I${ADDSRC}/libnet/include \
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -233,15 +275,24 @@ case $CMD in
 		;;
 	hping2)
 		cd ${ADDSRC}/hping2
-		./configure ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
-		${MK} || exit 1
+		case ${TARGET_ARCH} in
+			i386|amd64)
+				CROSSCOMPILE="-D__LITTLE_ENDIAN_BITFIELD" ${MK} || exit 1
+				;;
+			*)
+				CROSSCOMPILE="-D__BIG_ENDIAN_BITFIELD" ${MK} || exit 1
+				;;
+		esac
+		echo aaa
+		${MK} strip
 		install hping2 ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	mtr)
 		cd ${ADDSRC}/mtr
-		./configure --enable-ipv6 --without-gtk ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure --enable-ipv6 --without-gtk --without-jansson ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
@@ -250,7 +301,7 @@ case $CMD in
 	ipguard)
 		cd ${ADDSRC}/ipguard
 		${MK} clean || exit 1
-		${MK} || exit 1
+		${MK} PREFIX="${PKG}" LOCALBASE="${PKG}" || exit 1
 		install ipguard ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
@@ -271,6 +322,28 @@ case $CMD in
 		install upnpc-shared ${P}/bin/upnpc || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	pimd)
+		cd ${ADDSRC}/pimd
+		${CEXEC} echo ./configure --prefix=${P} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		install pimd ${P}/sbin || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	pimdd)
+		cd ${ADDSRC}/pimdd
+		${MK} clean || exit 1
+		${MK} || exit 1
+		install pimdd ${P}/sbin || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	freevrrpd)
+		cd ${ADDSRC}/freevrrpd
+		${MK} clean || exit 1
+		${MK} || exit 1
+		install freevrrpd ${P}/sbin || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	smartmontools)
 		cd ${ADDSRC}/smartmontools
 		./configure --enable-sample --disable-dependency-tracking --enable-drivedb ${PFX} || exit 1
@@ -289,7 +362,8 @@ case $CMD in
 		;;
 	quagga)
 		cd ${ADDSRC}/quagga
-		./configure --enable-user=quagga --enable-group=quagga --disable-snmp \
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure \
+				--enable-user=quagga --enable-group=quagga --disable-snmp \
 				--sysconfdir=/etc/quagga --localstatedir=/var/run/quagga \
 				--enable-vtysh --enable-opaque-lsa --enable-rtadv ${PFX} || exit 1
 		${MK} clean || exit 1
@@ -297,6 +371,44 @@ case $CMD in
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	bird2)
+		cd ${ADDSRC}/bird2
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure \
+				--with-protocols=babel --with-protocols=bfd --with-protocols=bgp \
+				--with-protocols=mrt --with-protocols=ospf --with-protocols=pipe \
+				--with-protocols=radv --with-protocols=rip --with-protocols=rpki \
+				--with-protocols=static --sysconfdir=/etc/bird --localstatedir=/var ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || ${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	bird)
+		cd ${ADDSRC}/bird
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure \
+				--sysconfdir=/etc/bird --localstatedir=/var ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || ${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	bird6)
+		cd ${ADDSRC}/bird
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure \
+				--enable-ipv6 --sysconfdir=/etc/bird --localstatedir=/var ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || ${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	tmux)
+		cd ${ADDSRC}/tmux
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	pcre)
 		cd ${ADDSRC}/pcre
 		./configure --enable-utf --enable-unicode-properties --enable-pcre8 \
@@ -342,10 +454,19 @@ case $CMD in
 		;;
 	rsync)
 		cd ${ADDSRC}/rsync
-		./configure.sh --disable-debug --enable-ipv6 --with-rsyncd-conf=/etc/rsyncd.conf \
-			--disable-iconv --with-included-popt ${PFX} || exit 1
+		${CEXEC} INSTALL="/usr/bin/install" ./configure.sh --disable-debug --enable-ipv6 --with-rsyncd-conf=/etc/rsyncd.conf \
+			--disable-iconv --disable-xxhash --disable-zstd --disable-lz4 --with-included-popt ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	lrzsz)
+		cd ${ADDSRC}/lrzsz
+		LDFLAGS="-L${PKG}/lib" CFLAGS="-I${PKG}/include" ${CEXEC} INSTALL="/usr/bin/install" ./configure \
+				${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || ${MK} || exit 1
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;