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)

18 files changed, 4 insertions, 20 deletions

diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index cb57866552f4..35c580404a92 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	david@catwhisker.org
 COMMENT=	A set of utilities to configure and monitor wireless access points
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_BZIP2=	yes
 USE_ICONV=	yes
 CONFIGURE_ENV=	LDFLAGS="-lintl -L${LOCALBASE}/lib" \
diff --git a/net-mgmt/arpscan/Makefile b/net-mgmt/arpscan/Makefile
index 7fc72bd401a8..53efb7ab17de 100644
--- a/net-mgmt/arpscan/Makefile
+++ b/net-mgmt/arpscan/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Simple arp scanner
 LIB_DEPENDS=	dnet.1:${PORTSDIR}/net/libdnet
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		 --with-libdnet=${LOCALBASE}
+CONFIGURE_ARGS=--with-libdnet=${LOCALBASE}
 
 PLIST_FILES=	bin/arpscan
 
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 277fe18eddac..b6d517513563 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Monitor arp & rarp requests
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--quiet --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--quiet
 MAKE_ENV+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}"
 INSTALL_TARGET=	install install-man
 MAN8=		arpwatch.8 arpsnmp.8
diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile
index 45558aafbb23..fc5a78f512c2 100644
--- a/net-mgmt/chillispot/Makefile
+++ b/net-mgmt/chillispot/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	venture37@geeklan.co.uk
 COMMENT=	Wireless LAN Access Point Controller
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=-build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=-sysconfdir=${PREFIX}/etc
 USE_RC_SUBR=	chillispot.sh
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/darkstat/Makefile b/net-mgmt/darkstat/Makefile
index ec1b53f0073e..b9dfd720be1a 100644
--- a/net-mgmt/darkstat/Makefile
+++ b/net-mgmt/darkstat/Makefile
@@ -17,7 +17,6 @@ USE_RC_SUBR=	darkstat
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	darkstat.1
 DOCS=	AUTHORS INSTALL README THANKS
diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile
index f4d06e420a6e..fc37851983b7 100644
--- a/net-mgmt/disco/Makefile
+++ b/net-mgmt/disco/Makefile
@@ -18,7 +18,6 @@ COMMENT=	IP discovery and fingerprinting utility
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net-mgmt/echolot/Makefile b/net-mgmt/echolot/Makefile
index e388d4664223..57fc0571289e 100644
--- a/net-mgmt/echolot/Makefile
+++ b/net-mgmt/echolot/Makefile
@@ -19,7 +19,6 @@ COMMENT=	A packet sniffer that grabs ARP packets on any ethernet devices
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	echolot.1
 
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 16b4236d3224..79f663adca21 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -46,7 +46,6 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 			LIBS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--enable-plugins
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if ${OSVERSION} < 502111
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile
index 166a900d2952..d004bd0e63e1 100644
--- a/net-mgmt/fprobe/Makefile
+++ b/net-mgmt/fprobe/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool that collects network traffic data
 
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 PLIST_FILES=	sbin/fprobe
 PORTDOCS=	ChangeLog README
diff --git a/net-mgmt/iftop/Makefile b/net-mgmt/iftop/Makefile
index 0c83a2535160..554160226dd4 100644
--- a/net-mgmt/iftop/Makefile
+++ b/net-mgmt/iftop/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Display bandwidth usage on an interface by host
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-resolver=netdb_1thread
 
 MAN8=		iftop.8
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index b18cff682ba2..0301b42edd23 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A network monitoring daemon
 
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib" \
 			YACC=${YACC} \
diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index d5ec3d706a9d..7206f3de73fe 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -15,7 +15,6 @@ COMMENT=	NetXMS - network monitoring system
 
 NO_PACKAGE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_ICONV=	yes
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 629ac748458d..9514904db29a 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} --enable-nfprofile --with-rrdpath=${LOCALBASE}
+CONFIGURE_ARGS=	--enable-nfprofile --with-rrdpath=${LOCALBASE}
 
 #flow-tools support
 OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off \
@@ -31,7 +31,7 @@ OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off \
 #for compatibility
 #
 .ifndef(WITHOUT_NFDUMP14_SUPPORT)
-CONFIGURE_ARGS=		--enable-compat14
+CONFIGURE_ARGS+=	--enable-compat14
 .endif
 
 PLIST_FILES=	bin/nfcapd bin/nfdump bin/nfreplay bin/nfexpire bin/nfprofile
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index a727cfcc80b4..4de2a2a93a39 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Command-line tools to collect and process NetFlow data
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 #flow-tools support
 OPTIONS=	FT2NFDUMP	"With Flow-tools to nfdump converter" off \
diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile
index eafd30ee0fdd..c0d1db725a20 100644
--- a/net-mgmt/openvmps/Makefile
+++ b/net-mgmt/openvmps/Makefile
@@ -21,7 +21,6 @@ USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=--bindir=${PREFIX}/sbin
 
 MAN1=		vmpsd.1
diff --git a/net-mgmt/packit/Makefile b/net-mgmt/packit/Makefile
index 23886e6f339d..341a94477b2a 100644
--- a/net-mgmt/packit/Makefile
+++ b/net-mgmt/packit/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Network auditing tool
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"
 
 MAN8=		packit.8
diff --git a/net-mgmt/sysmon/Makefile b/net-mgmt/sysmon/Makefile
index 12b19f436673..a534898f04d1 100644
--- a/net-mgmt/sysmon/Makefile
+++ b/net-mgmt/sysmon/Makefile
@@ -20,7 +20,6 @@ DOCS=		Changes.html binaries.html config.html docs.html index.html \
 MAN8=		sysmon.man.8 sysmon.conf.man.8
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/sysmon ${PREFIX}/bin
diff --git a/net-mgmt/tcptrack/Makefile b/net-mgmt/tcptrack/Makefile
index e73d87163964..c93fdfffad61 100644
--- a/net-mgmt/tcptrack/Makefile
+++ b/net-mgmt/tcptrack/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	squat@squat.no
 COMMENT=	Packet sniffer which displays TCP information like top(1)
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 PLIST_FILES=	bin/tcptrack
 MAN1=		tcptrack.1