--- elwix/config/rc.3thparty_helper	2014/01/07 08:41:30	1.1.2.1
+++ elwix/config/rc.3thparty_helper	2021/03/11 13:59:50	1.4
@@ -4,7 +4,7 @@
 #
 # ./rc.3thparty_helper [package] [make_tool] [prefix_dir] [build_arch_str]
 #
-# $Id: rc.3thparty_helper,v 1.1.2.1 2014/01/07 08:41:30 misho Exp $
+# $Id: rc.3thparty_helper,v 1.4 2021/03/11 13:59:50 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)
@@ -52,11 +52,15 @@ if [ $P = "/tmp/elwix" ]; then
 	install -d /tmp/elwix/share
 fi
 
-find . -name .deps -type d -exec rm -rf {} \;
+find ${ADDSRC} -name .deps -type d -exec rm -rf {} \;
 
 case $CMD in
+	automake)
+		cd ${ADDSRC}/automake
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	sudo)
-		cd sudo
+		cd ${ADDSRC}/sudo
 		./configure --sysconfdir=/etc --libexecdir=/usr/local/libexec --with-ignore-dot \
 					--with-tty-tickets --with-env-editor --with-logincap \
 					--with-long-otp-prompt --with-pam --with-logfac=local2 \
@@ -72,27 +76,44 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	expat)
-		cd expat
+		cd ${ADDSRC}/expat
 		./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
-	mpd)
-		cd libpdel
+	readline)
+		cd ${ADDSRC}/readline
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
-		find . -name \*.so\* -type f -exec install {} ${P}/lib \;
-		cd ..
-		cd mpd/src
+		${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
+#		${MK} || exit 1
+#		find . -name \*.so\* -type f -exec install {} ${P}/lib \;
+#		cd ..
+		cd ${ADDSRC}/mpd/src
+		${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 ..."
 		;;
 	libevent)
-		cd libevent
+		cd ${ADDSRC}/libevent
 		./configure ${PFX} --mandir=${P}/man --infodir=${P}/info || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -100,37 +121,78 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	mini_sendmail)
-		cd mini_sendmail
+		cd ${ADDSRC}/mini_sendmail
 		${MK} clean || exit 1
 		${MK} || exit 1
 		install mini_sendmail ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	choparp)
-		cd choparp
+		cd ${ADDSRC}/choparp
 		rm -f choparp
 		${MK} choparp || exit 1
 		install choparp ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	ttcp)
-		cd ttcp
+		cd ${ADDSRC}/ttcp
 		rm -f ttcp
 		${MK} ttcp || exit 1
 		install ttcp ${P}/bin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	iperf)
+		cd ${ADDSRC}/iperf
+		./configure ${PFX} || exit 1
+		${MK} clean || exit 1
+		${MK} || exit 1
+		${MK} install || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
 	trafshow)
-		cd trafshow
+		cd ${ADDSRC}/trafshow
 		./configure --sysconfdir=/etc ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${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 ipsec-tools
-		./configure --enable-shared --sysconfdir=/etc/racoon --localstatedir=/var/run \
+		cd ${ADDSRC}/ipsec-tools
+		./configure --enable-shared --sysconfdir=/etc/racoon --localstatedir=/var/run --with-pkgversion=elwix-0.8.2 \
 				 --enable-debug --enable-ipv6 --enable-adminport --enable-stats \
 				 --enable-dpd --enable-natt=yes --enable-frag --enable-hybrid \
 				 --without-libpam --disable-gssapi --with-libradius --without-libldap \
@@ -141,7 +203,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	dhcp)
-		cd dhcp
+		cd ${ADDSRC}/dhcp
 		./configure --localstatedir=/var --enable-paranoia --enable-early-chroot \
 				--enable-dhcpv6 ${PFX} || exit 1
 		${MK} clean || exit 1
@@ -152,7 +214,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	dhcping)
-		cd dhcping
+		cd ${ADDSRC}/dhcping
 		./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -160,7 +222,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	mrouted)
-		cd mrouted
+		cd ${ADDSRC}/mrouted
 		${MK} clean || exit 1
 		${MK} || exit 1
 		install map-mbone ${P}/sbin || exit 1
@@ -170,69 +232,79 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	igmpproxy)
-		cd igmpproxy
-		./configure ${PFX} || exit 1
+		cd ${ADDSRC}/igmpproxy
+		${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 ..."
 		;;
 	bmon)
-		cd bmon
-		./configure --disable-rrd --disable-asound --disable-dbi ${PFX} || exit 1
+		cd ${ADDSRC}/bmon
+		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
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	iftop)
-		cd iftop
+		cd ${ADDSRC}/iftop
 		./configure --with-resolver=netdb_1thread ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
-	arping)
-		echo ">>> Building libnet ..."
-		cd libnet
-		./configure ${PFX} || exit 1
+	libnet)
+		cd ${ADDSRC}/libnet
+		${CEXEC} INSTALL="/usr/bin/install" ./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
-		echo ">>> Building arping ..."
-		cd ../arping
-		env LDFLAGS=-L${TOP}/libnet/src CFLAGS=-I${TOP}/libnet/include ./configure ${PFX} || exit 1
+		echo ">>> Now rebuild elwix $CMD program ..."
+		;;
+	arping)
+		cd ${ADDSRC}/arping
+#		${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
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	hping2)
-		cd hping2
-		./configure ${PFX} || exit 1
+		cd ${ADDSRC}/hping2
+		${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
+		${MK} strip
 		install hping2 ${P}/sbin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	mtr)
-		cd mtr
-		./configure --enable-ipv6 --without-gtk --without-glib ${PFX} || exit 1
+		cd ${ADDSRC}/mtr
+		${CEXEC} INSTALL="/usr/bin/install" ./configure --enable-ipv6 --without-gtk ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	ipguard)
-		cd 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 ..."
 		;;
 	miniupnpd)
-		cd miniupnpd
+		cd ${ADDSRC}/miniupnpd
 		${MK} clean || exit 1
 		${MK} || exit 1
 		install miniupnpd ${P}/sbin || exit 1
@@ -240,7 +312,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	miniupnpc)
-		cd miniupnpc
+		cd ${ADDSRC}/miniupnpc
 		${MK} clean || exit 1
 		${MK} || exit 1
 		install libminiupnpc.so ${P}/lib || exit 1
@@ -248,8 +320,30 @@ case $CMD in
 		install upnpc-shared ${P}/bin/upnpc || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
+	pimd)
+		cd ${ADDSRC}/pimd
+		${CEXEC} echo ./configure ${PFX} || 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 smartmontools
+		cd ${ADDSRC}/smartmontools
 		./configure --enable-sample --disable-dependency-tracking --enable-drivedb ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -257,7 +351,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	libiconv)
-		cd libiconv
+		cd ${ADDSRC}/libiconv
 		./configure --enable-static --without-libintl-prefix ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -265,8 +359,9 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	quagga)
-		cd quagga
-		./configure --enable-user=quagga --enable-group=quagga \
+		cd ${ADDSRC}/quagga
+		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
@@ -274,8 +369,46 @@ 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 pcre
+		cd ${ADDSRC}/pcre
 		./configure --enable-utf --enable-unicode-properties --enable-pcre8 \
 				--enable-pcre16 --enable-pcre32 ${PFX} || exit 1
 		${MK} clean || exit 1
@@ -284,7 +417,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	libxml2)
-		cd libxml2
+		cd ${ADDSRC}/libxml2
 		./configure --without-python ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -292,7 +425,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	php)
-		cd php
+		cd ${ADDSRC}/php
 		./configure --with-layout=GNU --localstatedir=/var --with-config-file-scan-dir=/etc/php \
 			--disable-all --enable-libxml --enable-xml --with-libxml-dir=${P} --with-openssl \
 			--enable-zip --enable-sqlite-utf8 ${PFX} || exit 1
@@ -304,30 +437,39 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	scan_ffs)
-		cd scan_ffs
+		cd ${ADDSRC}/scan_ffs
 		${MK} clean || exit 1
 		${MK} || exit 1
 		install scan_ffs ${P}/bin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	dnsmasq)
-		cd dnsmasq
+		cd ${ADDSRC}/dnsmasq
 		${MK} clean || exit 1
 		${MK} || exit 1
 		install src/dnsmasq ${P}/bin || exit 1
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	rsync)
-		cd rsync
-		./configure.sh --disable-debug --enable-ipv6 --with-rsyncd-conf=/etc/rsyncd.conf \
+		cd ${ADDSRC}/rsync
+		${CEXEC} INSTALL="/usr/bin/install" ./configure.sh --disable-debug --enable-ipv6 --with-rsyncd-conf=/etc/rsyncd.conf \
 			--disable-iconv --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 ..."
+		;;
 	istgt)
-		cd istgt
+		cd ${ADDSRC}/istgt
 		./configure --enable-symlink-device ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -336,7 +478,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	ntp)
-		cd ntp
+		cd ${ADDSRC}/ntp
 		./configure --without-ntpsnmpd --with-crypto --enable-ipv6 --enable-BANCOMM \
 			--enable-GPSVME --enable-ACTS --enable-ARBITER --enable-ARCRON_MSF \
 			--enable-AS2201 --enable-ATOM --enable-CHRONOLOG --enable-CHU \
@@ -356,7 +498,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	nginx)
-		cd nginx
+		cd ${ADDSRC}/nginx
 		./configure --conf-path=/etc/nginx.conf --user=www --group=www \
 			--pid-path=/var/run/nginx.pid \
 			--error-log-path=/var/log/nginx-error.log \
@@ -369,7 +511,7 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	spawn-fcgi)
-		cd spawn-fcgi
+		cd ${ADDSRC}/spawn-fcgi
 		./configure ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
@@ -377,8 +519,10 @@ case $CMD in
 		echo ">>> Now rebuild elwix $CMD program ..."
 		;;
 	lighttpd)
-		cd lighttpd
-		./configure --enable-static --with-openssl ${PFX} || exit 1
+		cd ${ADDSRC}/lighttpd
+		./configure --libdir=/usr/local/lib/lighttpd --without-attr --without-bzip2 \
+			--without-gdbm --without-libev --without-lua --without-memcached --with-openssl \
+			--without-valgrind --enable-static ${PFX} || exit 1
 		${MK} clean || exit 1
 		${MK} || exit 1
 		${MK} install || exit 1