Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.

Specifically, newer autoconf (> 2.13) has different semantic of the
configure target. In short, one should use --build=CONFIGURE_TARGET
instead of CONFIGURE_TARGET directly. Otherwise, you will get a warning
and the old semantic may be removed in later autoconf releases.

To workaround this issue, many ports hack the CONFIGURE_TARGET variable
so that it contains the ``--build='' prefix.

To solve this issue, under the fact that some ports still have
configure script generated by the old autoconf, we use runtime detection
in the do-configure target so that the proper argument can be used.

Changes to Mk/*:
 - Add runtime detection magic in bsd.port.mk
 - Remove CONFIGURE_TARGET hack in various bsd.*.mk
 - USE_GNOME=gnometarget is now an no-op

Changes to individual ports, other than removing the CONFIGURE_TARGET hack:

= pkg-plist changed (due to the ugly CONFIGURE_TARGET prefix in * executables)
  - comms/gnuradio
  - science/abinit
  - science/elmer-fem
  - science/elmer-matc
  - science/elmer-meshgen2d
  - science/elmerfront
  - science/elmerpost

= use x86_64 as ARCH
  - devel/g-wrap

= other changes
  - print/magicfilter
    GNU_CONFIGURE -> HAS_CONFIGURE since it's not generated by autoconf

Total # of ports modified:  1,027
Total # of ports affected: ~7,000 (set GNU_CONFIGURE to yes)

PR:		126524 (obsoletes 52917)
Submitted by:	rafan
Tested on:	two pointyhat 7-amd64 exp runs (by pav)
Approved by:	portmgr (pav)

69 files changed, 2 insertions, 74 deletions

diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index 49fd296..862dd37 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -18,7 +18,6 @@ COMMENT=	TCP proxy for applications that don't speak IPv6
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}rc2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_AUTOTOOLS=	autoconf:262
 ALL_TARGET=	default
 
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index 000f2a7..e90028f 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -22,7 +22,6 @@ WWW_DIR?=	${PREFIX}/www/
 PLIST_SUB+=	VERSION=${PORTVERSION}
 USE_PERL5=	yes
 USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(WITHOUT_IPV6)
 CONFIGURE_ARGS=
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index 00a4475..cd6d3b6 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_ZIP=	yes
 USE_RC_SUBR=	binkd.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		binkd.8
 
diff --git a/net/bsdproxy/Makefile b/net/bsdproxy/Makefile
index 95bb1cd..d4b469f 100644
--- a/net/bsdproxy/Makefile
+++ b/net/bsdproxy/Makefile
@@ -15,7 +15,6 @@ COMMENT=	A TCP proxy, demonstrating use of the kevent(2)/kqueue(2) API
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib12
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		ChangeLog README
 
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 2fd404e..db9a3b0 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 USE_OPENSSL=	yes
 
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 319c752..e6a47f7 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -25,7 +25,6 @@ LIB_DEPENDS=	lwp.2:${PORTSDIR}/devel/lwp \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CONFIGURE_ARGS+=	--enable-${CODA_SUITE}
 
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 7823d50..375ec32 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A circuit-level firewall/proxy
 CONFLICTS=	socks5-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
 		--with-sockd-conf=${PREFIX}/etc/sockd.conf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index 297d0f2..30ad9ff 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	A smart LDAP directory management tool
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs
 USE_OPENLDAP=	yes
diff --git a/net/etrace/Makefile b/net/etrace/Makefile
index 59e1c07..d05953f 100644
--- a/net/etrace/Makefile
+++ b/net/etrace/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet \
 
 WRKSRC=		${WRKDIR}/etrace
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-libdnet=${PREFIX}
 
 MAN8=	etrace.8
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index 5af96bc..1de6103 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A ftp-like client for the FSP service
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		fsp.1
 PLIST_FILES=	bin/fsp
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 3566995..1d3a3de 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 USE_RC_SUBR=	gnugk.sh
 
 USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--disable-firebird
 
 USE_GMAKE=	yes
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index de106d6..0ef0516 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -22,7 +22,6 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl:15 libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	radiusd.sh
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 1829e26..0d72f1d 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Fetch listings and books from Project Gutenberg
 LIB_DEPENDS=	gutenfetch:${PORTSDIR}/devel/libgutenfetch
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_GMAKE=	yes
diff --git a/net/hidentd/Makefile b/net/hidentd/Makefile
index 8e7fdab..751bfd4 100644
--- a/net/hidentd/Makefile
+++ b/net/hidentd/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple and secure ident (RFC1413) server
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN8=		hidentd.8
 
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index 9ca8ce5..5ff1760 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
 
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libdnet=${LOCALBASE} \
 		--with-libevent=${LOCALBASE}
 
diff --git a/net/icpld/Makefile b/net/icpld/Makefile
index e91eeaa..0328dfc 100644
--- a/net/icpld/Makefile
+++ b/net/icpld/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Internet connection performance logging daemon
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		${PORTNAME}.1
 
diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile
index 67315e8..1e0112d 100644
--- a/net/ipsumdump/Makefile
+++ b/net/ipsumdump/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Produce ASCII summary of network traffic or tcpdump(1) file
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 
diff --git a/net/iscsi-target/Makefile b/net/iscsi-target/Makefile
index 8eedaa4..e4aef10 100644
--- a/net/iscsi-target/Makefile
+++ b/net/iscsi-target/Makefile
@@ -20,7 +20,6 @@ COMMENT=	Implementation of userland ISCSI target (from NetBSD)
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN5=		targets.5
 MAN8=		iscsi-target.8
diff --git a/net/lam/Makefile b/net/lam/Makefile
index c336d67..b9756cb 100644
--- a/net/lam/Makefile
+++ b/net/lam/Makefile
@@ -18,7 +18,6 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rsh=ssh --without-fc
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
 
 MAN1=	hboot.1 \
diff --git a/net/latd/Makefile b/net/latd/Makefile
index f79f969..517f3fa 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -17,7 +17,6 @@ COMMENT=	The linux-decnet project LAT protocol suite
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+=	-Wno-deprecated
 
 MAN1=		llogin.1
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index bf7a226..3361265 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -15,7 +15,6 @@ MAINTAINER?=	onatan@gmail.com
 COMMENT=	A simple interface to low level networking routines
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 
 .if !defined(LIBDNET_SLAVE)
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index 5128113..fa16513 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -19,7 +19,6 @@ COMMENT=	A C library for creating IP packets (development version)
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${SHORT_VER}
diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index d58dcad..b25e348 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index 540c076..f0868a5 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	pcapnav.0:${PORTSDIR}/net/libpcapnav
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib12
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 USE_LDCONFIG=	yes
 
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 420ed72..840df65 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -21,7 +21,6 @@ OPTIONS=	LIBNET "Include code requiring libnet" ON \
 
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index ac8baa8..82c3d78 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	vd@FreeBSD.org
 COMMENT=	NSS module using a MySQL database for backend
 
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index bfdcbe8..3026485 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-shared --disable-trace
diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile
index 9f8c4996..e2dac8b 100644
--- a/net/libtrace/Makefile
+++ b/net/libtrace/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	matt@peterson.org
 COMMENT=	C library for network device, raw & compressed network flows
 
 CONFIGURE_ARGS=	--with-libpcap=${LOCALBASE}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile
index 94dc413..9e1f45a 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -15,7 +15,6 @@ COMMENT=	SAP and SLP announcement for the VLC Media Player
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 MAN1=		sapserver.1
 PLIST_FILES=	bin/sapserver etc/sap.cfg-dist etc/rc.d/sapserver.sh
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 5021834..7d5ccf4 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -33,7 +33,6 @@ USE_PERL5_BUILD=yes
 USE_GNOME=	pkgconfig
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-romio --enable-sharedlibs=gcc
 CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" LDFLAGS="${PTHREAD_LIBS}" F77="${F77}" FFLAGS="${FFLAGS}"
 FFLAGS?=	-O2
diff --git a/net/nast/Makefile b/net/nast/Makefile
index 9a384d2..0a32687 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 MAN8=		nast.8
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 USE_GMAKE=	yes
 
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index acde2ba..6539dab 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -20,7 +20,6 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index aadb3b0..1d2a245 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -32,7 +32,6 @@ CONFIGURE_ARGS+=	--enable-debug-logging
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=	README README.VFS logo-shaded.svg
 MAN8=	nepenthes.8
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index df5e445..4f7bae0 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -56,7 +56,6 @@ PLIST_SUB+=		TIMELORD=""
 PLIST_SUB+=		TIMELORD="@comment "
 .endif
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 94b0f51..d5a48bd 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -32,7 +32,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PLIST_SUB=	DBDIR=${DBDIR} \
 		PORTVERSION=${PORTVERSION}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DBDIR} \
 		--with-ossl-root=${OPENSSLBASE} \
 		--with-gdbm-root=${LOCALBASE} \
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index d9b976b..06f5d7c 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -20,7 +20,6 @@ COMMENT=	The Network Time Protocol Distribution
 LATEST_LINK=	${PORTNAME}-dev
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		sntp.1
 
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 623eb96..c77b202 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -20,7 +20,6 @@ COMMENT=	The Network Time Protocol Distribution
 LATEST_LINK=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_AUTOTOOLS=	automake:19
 
 .if defined(ENABLE_RAWDCF)
diff --git a/net/nylon/Makefile b/net/nylon/Makefile
index b4f5859..c69d5b6 100644
--- a/net/nylon/Makefile
+++ b/net/nylon/Makefile
@@ -21,7 +21,6 @@ USE_RC_SUBR=	nylon.sh
 
 GNU_CONFIGURE=	yes
 # Necessary for $PREFIX to work:
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE}
 
 MAN1=		nylon.1
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 9d5102b..57c0a71 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -379,7 +379,6 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
 			LDFLAGS="${LDFLAGS}" \
 			LIBS="${LIBS}"
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index fd4f59f..cb29590 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -425,7 +425,6 @@ CPPFLAGS+=		${PTHREAD_CFLAGS} \
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
 			LDFLAGS="${LDFLAGS}" \
 			LIBS="${LIBS}"
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 5293698..97fe7711 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -21,7 +21,6 @@ USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openslp \
 		--localstatedir=/var
-CONFIGURE_TARGET=--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index 6f07438..3a3612b 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	ex.10:${PORTSDIR}/devel/ossp-ex
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-ex=${LOCALBASE}
 USE_LDCONFIG=	yes
 
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index 8ed08dee..1422cfb 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PLIST_FILES=	bin/panoptis bin/mail.py bin/pview.py bin/speed.py
 
 do-install:
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 001fe76..6903254 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -24,7 +24,6 @@ COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software
 CONFLICTS=	openbgpd-[0-9]* zebra-0*
 
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=		yes
 USE_LDCONFIG=		yes
 USE_PERL5_BUILD=	yes
diff --git a/net/rfbproxy/Makefile b/net/rfbproxy/Makefile
index 61bdcae..e0de011 100644
--- a/net/rfbproxy/Makefile
+++ b/net/rfbproxy/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple tool for recording VNC sessions
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		rfbproxy.1
 PLIST_FILES=	bin/rfbproxy
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index f7bad8a..74eeab7 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -18,7 +18,6 @@ COMMENT=	The RIPE whois client version 3
 USE_PERL5_BUILD=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		whois3.1
 PLIST_FILES=	bin/whois3
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index a71e61d..64adf12 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	The popular Roaring Penguin's PPPoE software
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PATCH_WRKSRC=	${WRKSRC}/src
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index d0c8c55..d1631ff 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -28,7 +28,6 @@ USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --enable-ipv6 \
 		--with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	NEWS README csprotocol.txt tech_report.tex
diff --git a/net/samba-pdbsql/Makefile b/net/samba-pdbsql/Makefile
index 6b37ab3..1796967 100644
--- a/net/samba-pdbsql/Makefile
+++ b/net/samba-pdbsql/Makefile
@@ -43,7 +43,6 @@ SAMBA_PDBDIR=		${SAMBA_MODULEDIR}/pdb
 
 BUILD_DEPENDS+=		${NONEXISTENT}:${PORTSDIR}/${SAMBA_PORT}:configure
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--libdir=${SAMBA_PDBDIR} \
 			--with-samba-dir=${SAMBA_WRKSRC}
 
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 72caa52..50e1342 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -44,8 +44,6 @@ SAMBA_LIB=		lib
 SAMBA_LIBDIR=		${PREFIX}/${SAMBA_LIB}
 SAMBA_MODULEDIR=	${SAMBA_LIBDIR}/samba
 
-CONFIGURE_TARGET=	--build="${MACHINE_ARCH}-portbld-freebsd${OSREL}"
-
 CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 			--localstatedir="${VARDIR}" \
 		        --with-configdir="${SAMBA_CONFDIR}" \
diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
index c765ff6..ffed10d 100644
--- a/net/samba4wins/Makefile
+++ b/net/samba4wins/Makefile
@@ -35,8 +35,6 @@ S4W_CONFDIR=		${PREFIX}/etc
 S4W_LIBDIR=		${PREFIX}/lib/${PORTNAME}
 S4W_CONFIG=		${S4W_CONFDIR}/samba4wins.conf
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
 			--datadir=${S4W_DATADIR} \
 	    		--libdir=${S4W_LIBDIR} \
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index e5b2d71..2dbc687 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -23,7 +23,6 @@ GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/net/shmux/Makefile b/net/shmux/Makefile
index bb3c3f5..6994a78 100644
--- a/net/shmux/Makefile
+++ b/net/shmux/Makefile
@@ -19,7 +19,6 @@ OPTIONS=	FPING "Use fping utility" on	\
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/examples
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 ALL_TARGET=	${PORTNAME}
 
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index f60464c..088c0b3 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -29,7 +29,6 @@ COMMENT=	Secure Internet Live Conferencing (SILC) network client
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index 78e61d5..0494d93 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	osip2.5:${PORTSDIR}/net/libosip
 
 USE_RC_SUBR=	siproxd.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--with-libosip-prefix=${PREFIX}
+CONFIGURE_ARGS=	--with-libosip-prefix=${PREFIX}
 
 PORTDOCS1=	AUTHORS ChangeLog README RELNOTES
 PORTDOCS2=	FAQ KNOWN_BUGS RFC3261_compliance.txt \
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 77c1e1b..3eff5ac 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -21,7 +21,6 @@ USE_OPENLDAP=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-binpathbase=${PREFIX}/sbin \
 		--with-docpathbase=${PREFIX}/share/doc \
 		--with-confpathbase=${PREFIX}/etc \
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index bf5d72e..8381216 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -17,7 +17,6 @@ COMMENT=	The Cisco remote authentication/authorization/accounting server
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	tac_plus
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-groupid=$$(/usr/bin/id -g tacacs 2>/dev/null || echo '559') \
 		--with-userid=$$(/usr/bin/id -u tacacs 2>/dev/null || echo '559')
 
diff --git a/net/tacshell/Makefile b/net/tacshell/Makefile
index 3d13a2c..a67a43a 100644
--- a/net/tacshell/Makefile
+++ b/net/tacshell/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shell authentication for TACACS+ protocol
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	README WHATSNEW ChangeLog
 PLIST_FILES=	bin/tacshell etc/tacshell.conf.sample
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index d391cb0..8d72a2c 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -23,8 +23,6 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig glib20 gnomehack
 USE_LDCONFIG=	yes
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
diff --git a/net/tcpstat/Makefile b/net/tcpstat/Makefile
index 8ecacda..7ecd895 100644
--- a/net/tcpstat/Makefile
+++ b/net/tcpstat/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to report various network statistics
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		tcpstat.1 tcpprof.1
 DOCS=		AUTHORS ChangeLog LICENSE README doc/Tips_and_Tricks.txt 
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
index 020b3b9..5a88d63 100644
--- a/net/tcptraceroute-devel/Makefile
+++ b/net/tcptraceroute-devel/Makefile
@@ -27,7 +27,6 @@ MAN1=	tcptraceroute.1
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
 CONFIGURE_ARGS=		--with-libpcap=/usr --bindir=${PREFIX}/sbin
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 INSTALL_TARGET=	install-exec-am install-man
 
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index fe3a198..74f4a38 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -19,7 +19,6 @@ USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-os-dir=no --with-ssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index d7b16e2..fbc8458 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} \
 		--sysconfdir=${PREFIX}/etc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		trickle.1
 MAN5=		trickled.conf.5
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index f8803a7..bd0a490 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -33,7 +33,6 @@ USE_PERL5=	yes
 USE_QT_VER=	3
 
 CONFIGURE_ARGS=	--with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" \
 		CFLAGS="${CFLAGS}"
 MAKE_ENV=	QTDIR=${QT_PREFIX}
diff --git a/net/uplog/Makefile b/net/uplog/Makefile
index b611e8c..0a78331 100644
--- a/net/uplog/Makefile
+++ b/net/uplog/Makefile
@@ -16,7 +16,6 @@ COMMENT=	UDP-based ping programm
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	README
 PLIST_FILES=	bin/uplog
diff --git a/net/vomit/Makefile b/net/vomit/Makefile
index ee43164..287d137f 100644
--- a/net/vomit/Makefile
+++ b/net/vomit/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent \
 		dnet.1:${PORTSDIR}/net/libdnet
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net/wol/Makefile b/net/wol/Makefile
index ff78431..934a2c7 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -21,7 +21,6 @@ USE_PERL5_BUILD=	yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS=	--disable-nls
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index 73b662b..69bbb6d07 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"		\
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
 CONFIGURE_ARGS=	--program-transform="s|^|xre-|" \
 		--with-expat=/usr/local
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 80f2e85..1e93ff0 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -23,11 +23,9 @@ USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--prefix=${PREFIX}/${PORTNAME}			\
 			--with-comment='FreeBSD port: ${PKGNAME}'	\
-			--with-openssl=/usr				\
-			${CONFIGURE_TARGET}
+			--with-openssl=/usr
 
 CONFIGURE_ENV+=		CXXFLAGS="-Wno-uninitialized"