diff options
author | Rong-En Fan <rafan@FreeBSD.org> | 2008-08-21 06:18:49 +0000 |
---|---|---|
committer | Rong-En Fan <rafan@FreeBSD.org> | 2008-08-21 06:18:49 +0000 |
commit | 741aa714833b9bb1e9afaaf5124d3f5c60b5e49c (patch) | |
tree | e9b79b363f2fc4a63535a25c71491fa49a79b556 /net-p2p | |
parent | e6b2e4b3537ce43e377d2f4fe0ac46b6ab8c4395 (diff) | |
download | ports-741aa714833b9bb1e9afaaf5124d3f5c60b5e49c.tar.gz ports-741aa714833b9bb1e9afaaf5124d3f5c60b5e49c.zip |
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)
Notes
Notes:
svn path=/head/; revision=218938
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/amule-devel/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/amule/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/amule2/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/ctorrent/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/dclib/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/libtorrent/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/mooseekd/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/mutella/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/opendchub/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/qbittorrent-22/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/qbittorrent/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/rtorrent/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/valknut/Makefile | 2 |
13 files changed, 0 insertions, 14 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 5f5646c5e5bc..714bba907d01 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -27,7 +27,6 @@ USE_GMAKE= yes USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 5f5646c5e5bc..714bba907d01 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -27,7 +27,6 @@ USE_GMAKE= yes USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile index 5f5646c5e5bc..714bba907d01 100644 --- a/net-p2p/amule2/Makefile +++ b/net-p2p/amule2/Makefile @@ -27,7 +27,6 @@ USE_GMAKE= yes USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/net-p2p/ctorrent/Makefile b/net-p2p/ctorrent/Makefile index 4ea44a0041cc..1dff1823351f 100644 --- a/net-p2p/ctorrent/Makefile +++ b/net-p2p/ctorrent/Makefile @@ -18,7 +18,6 @@ GNU_CONFIGURE= yes #WRKSRC= ${WRKDIR}/${PORTNAME}-dnh${PATCHLEVEL} PLIST_FILES= bin/ctorrent -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PORTDOCS= README-DNH.TXT UserGuide diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile index 348fa4036275..baa2b1c89813 100644 --- a/net-p2p/dclib/Makefile +++ b/net-p2p/dclib/Makefile @@ -27,7 +27,6 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_OPENSSL= yes USE_LDCONFIG= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-extract: ${CHMOD} 0755 ${WRKSRC}/admin/install-sh diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 3cb056590c33..cb497979e9e4 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -27,7 +27,6 @@ USE_GNOME= pkgconfig gnomehack USE_OPENSSL= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} EXTRA_PATCHES?= ${.CURDIR}/files/stable-* diff --git a/net-p2p/mooseekd/Makefile b/net-p2p/mooseekd/Makefile index ad7be0466ba6..f25bd29e87a0 100644 --- a/net-p2p/mooseekd/Makefile +++ b/net-p2p/mooseekd/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" USE_FAM= yes diff --git a/net-p2p/mutella/Makefile b/net-p2p/mutella/Makefile index a38ae1a1043c..442514429f29 100644 --- a/net-p2p/mutella/Makefile +++ b/net-p2p/mutella/Makefile @@ -18,7 +18,6 @@ COMMENT= A command line Gnutella client MAN1= mutella.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile index 4b3b0b42a1e6..8a53b1901bc3 100644 --- a/net-p2p/opendchub/Makefile +++ b/net-p2p/opendchub/Makefile @@ -17,7 +17,6 @@ COMMENT= Unofficial Unix version of the Direct Connect Hub software USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" post-install: diff --git a/net-p2p/qbittorrent-22/Makefile b/net-p2p/qbittorrent-22/Makefile index a979aa06a3b8..ee55a6e22446 100644 --- a/net-p2p/qbittorrent-22/Makefile +++ b/net-p2p/qbittorrent-22/Makefile @@ -23,7 +23,6 @@ QT_COMPONENTS= qmake_build uic_build moc_build rcc_build gui network xml QT_NONSTANDARD= yes INSTALLS_ICONS= yes HAS_CONFIGURE= yes -CONFIGURE_TARGET= # CONFIGURE_ARGS= --with-libtorrent-inc="${LOCALBASE}/include" \ --with-libtorrent-lib="${LOCALBASE}/lib" CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index a979aa06a3b8..ee55a6e22446 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -23,7 +23,6 @@ QT_COMPONENTS= qmake_build uic_build moc_build rcc_build gui network xml QT_NONSTANDARD= yes INSTALLS_ICONS= yes HAS_CONFIGURE= yes -CONFIGURE_TARGET= # CONFIGURE_ARGS= --with-libtorrent-inc="${LOCALBASE}/include" \ --with-libtorrent-lib="${LOCALBASE}/lib" CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 2264e2ba8811..b18868c93924 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -26,7 +26,6 @@ MAN1= rtorrent.1 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} SUB_FILES= pkg-message diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile index 4fe0feac5b95..157114884fce 100644 --- a/net-p2p/valknut/Makefile +++ b/net-p2p/valknut/Makefile @@ -38,8 +38,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ RCC="${LOCALBASE}/bin/rcc" LRELEASE="${LOCALBASE}/bin/lrelease-qt4" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - post-patch: @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} |