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 /x11-toolkits | |
parent | e6b2e4b3537ce43e377d2f4fe0ac46b6ab8c4395 (diff) |
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 'x11-toolkits')
-rw-r--r-- | x11-toolkits/SoXt/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/fltk/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/fltk2/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/fox14/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/gnustep-back/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/gnustep-gui/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/gob/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/libgtkeditor/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/movingmotif/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/neXtaw/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/paragui-devel/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/py-gtk/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/soqt/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/wxgtk24/Makefile | 2 | ||||
-rw-r--r-- | x11-toolkits/xbae/Makefile | 1 |
15 files changed, 1 insertions, 15 deletions
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile index 167cc8b9cb9d..a00f27e103bb 100644 --- a/x11-toolkits/SoXt/Makefile +++ b/x11-toolkits/SoXt/Makefile @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${LOCALBASE} # avoid renaming of soxt-config and soxt-config.1 -CONFIGURE_TARGET= --target="" USE_LDCONFIG= yes MAN1= soxt-config.1 diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index 0c6b5ccfcba5..ef94c867e90a 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -36,7 +36,6 @@ VERSION= 1.1.7 USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--enable-shared --enable-xft # configure ignores ${CXX} and keeps on linking C++ code with ${CC} CONFIGURE_ENV+= CC="${CXX}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile index ff0381e4d9a0..fa0e7af77be4 100644 --- a/x11-toolkits/fltk2/Makefile +++ b/x11-toolkits/fltk2/Makefile @@ -54,7 +54,6 @@ CONFIGURE_ARGS+= --enable-jpeg --enable-png --enable-gl --enable-xft \ # after possibly incompatible updates to fltk2. CONFIGURE_ARGS+= --disable-shared CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbuild-freebsd${OSREL} DOCSDIR= ${PREFIX}/share/doc/fltk2 PORTDOCS= * diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 83e62a50cc5f..3c0de3fd2d67 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -32,7 +32,6 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER} USE_AUTOTOOLS= libtool:15 USE_GL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe USE_LDCONFIG= yes diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index b73319f3660c..0c7c629b02b7 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -21,7 +21,6 @@ LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes -CONFIGURE_TARGET= CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index 35083709c84e..4b6b2f585982 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -21,7 +21,6 @@ LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif RESTRICTED= GPL3 GNU_CONFIGURE= yes -CONFIGURE_TARGET= CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile index 1fde69f14e77..fd6738881326 100644 --- a/x11-toolkits/gob/Makefile +++ b/x11-toolkits/gob/Makefile @@ -20,7 +20,6 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gob.1 diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile index b1a7d9ee2b0e..c514bb3bb601 100644 --- a/x11-toolkits/libgtkeditor/Makefile +++ b/x11-toolkits/libgtkeditor/Makefile @@ -27,7 +27,6 @@ CFLAGS+= -fPIC CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} pre-configure: .for file in install-sh mkinstalldirs diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile index d7273dddf293..cd871f6d3949 100644 --- a/x11-toolkits/movingmotif/Makefile +++ b/x11-toolkits/movingmotif/Makefile @@ -16,7 +16,6 @@ COMMENT= Display scientific data as dynamic plot USE_MOTIF= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile index 854c970956a0..b07743f08705 100644 --- a/x11-toolkits/neXtaw/Makefile +++ b/x11-toolkits/neXtaw/Makefile @@ -17,7 +17,6 @@ COMMENT= Athena Widgets with N*XTSTEP appearance USE_AUTOTOOLS= libtool:15 USE_XORG= xmu x11 xext GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile index 5114edeec114..795fcffd619f 100644 --- a/x11-toolkits/paragui-devel/Makefile +++ b/x11-toolkits/paragui-devel/Makefile @@ -26,7 +26,6 @@ CONFLICTS= paragui-[0-9]* USE_AUTOTOOLS= libtool:15 USE_SDL= sdl image ttf LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index b78524d4b774..e848a46f6e25 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -29,7 +29,6 @@ USE_GNOME= gnomelibs gdkpixbuf libglade USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ENV= PYTHON=${PYTHON_CMD} -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gtk diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index b0cf8b1436be..60c37d33a41a 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -22,7 +22,6 @@ USE_AUTOTOOLS= libtool:15 USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_ARGS= --with-pthread=yes --with-coin=${LOCALBASE} USE_LDCONFIG= yes diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index d6a0e4b53a03..138ed88ecdde 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-libpng=sys \ --with-libtiff=sys \ --with-zlib=sys \ --with-opengl\ - --enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}\ + --enable-gtk2 \ --includedir=${PREFIX}/include/wx-2.4 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ -I${LOCALBASE}/include \ diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile index 200cb3844442..05e5a75b5fde 100644 --- a/x11-toolkits/xbae/Makefile +++ b/x11-toolkits/xbae/Makefile @@ -20,7 +20,6 @@ COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_MOTIF= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS=--enable-production --enable-static MAN3= XbaeCaption.3 XbaeInput.3 XbaeMatrix.3 |