diff options
author | rafan <rafan@FreeBSD.org> | 2008-08-21 06:18:49 +0000 |
---|---|---|
committer | rafan <rafan@FreeBSD.org> | 2008-08-21 06:18:49 +0000 |
commit | c8007265d81e778bec43e1f7b073b196887b3604 (patch) | |
tree | a30fd3dc7b50670b88ce6f8cf28e0ccf2b1e599a /comms | |
parent | 9f3176cd391ec72812d7f37e93b881faa3648b45 (diff) | |
download | FreeBSD-ports-c8007265d81e778bec43e1f7b073b196887b3604.zip FreeBSD-ports-c8007265d81e778bec43e1f7b073b196887b3604.tar.gz |
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)
Diffstat (limited to 'comms')
-rw-r--r-- | comms/aldo/Makefile | 1 | ||||
-rw-r--r-- | comms/fldigi/Makefile | 1 | ||||
-rw-r--r-- | comms/gnokii/Makefile | 1 | ||||
-rw-r--r-- | comms/gnuradio/Makefile | 4 | ||||
-rw-r--r-- | comms/gnuradio/pkg-plist | 56 | ||||
-rw-r--r-- | comms/hf/Makefile | 1 | ||||
-rw-r--r-- | comms/kallers/Makefile | 1 | ||||
-rw-r--r-- | comms/linrad/Makefile | 1 | ||||
-rw-r--r-- | comms/lirc/Makefile | 1 | ||||
-rw-r--r-- | comms/qicosi/Makefile | 1 | ||||
-rw-r--r-- | comms/scmxx/Makefile | 1 |
11 files changed, 29 insertions, 40 deletions
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index 9163c51..ef120a0 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= ao:${PORTSDIR}/audio/libao USE_BZIP2= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:262 automake:110 libtool:15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 3312d5c..f1e59e4 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -24,7 +24,6 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" && ${OSVERSION} < 700000 diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 369a8e1..ae51f92 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -32,7 +32,6 @@ CONFIGURE_ENV+= MSGFMT="${LOCALBASE}/bin/msgfmt" \ CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \ LIBS="-L../common -L${LOCALBASE}/lib" \ PKG_CONFIG="${LOCALBASE}/bin/pkg-config" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PKGDEINSTALL= ${PKGINSTALL} SUB_FILES+= pkg-message diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 661591d..7182465 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnuradio PORTVERSION= 3.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms astro hamradio MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gnuradio @@ -50,8 +50,6 @@ CONFIGURE_ARGS= --with-boost-include-dir="${LOCALBASE}/include/" \ --disable-html-docs \ --disable-latex-docs -PLIST_SUB+= RELEASE="${MACHINE_ARCH}-portbld-freebsd${OSREL}" - post-patch: @${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4 @${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \ diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index 3de04f5..219eb32 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -1,31 +1,31 @@ -bin/%%RELEASE%%-gpio_rx_sfile.py -bin/%%RELEASE%%-gpio_usrp_siggen.py -bin/%%RELEASE%%-gpio_usrp_fft.py -bin/%%RELEASE%%-gr_plot_char.py -bin/%%RELEASE%%-gr_plot_const.py -bin/%%RELEASE%%-gr_plot_fft_c.py -bin/%%RELEASE%%-gr_plot_fft_f.py -bin/%%RELEASE%%-gr_plot_float.py -bin/%%RELEASE%%-gr_plot_int.py -bin/%%RELEASE%%-gr_plot_iq.py -bin/%%RELEASE%%-gr_plot_short.py -bin/%%RELEASE%%-usrp_cal_dc_offset -bin/%%RELEASE%%-usrp_fft.py -bin/%%RELEASE%%-usrp_flex.py -bin/%%RELEASE%%-usrp_flex_all.py -bin/%%RELEASE%%-usrp_flex_band.py -bin/%%RELEASE%%-usrp_oscope.py -bin/%%RELEASE%%-usrp_print_db.py -bin/%%RELEASE%%-usrp_psr_receiver.py -bin/%%RELEASE%%-usrp_ra_receiver.py -bin/%%RELEASE%%-usrp_radar_mono.py -bin/%%RELEASE%%-usrp_rx_cfile.py -bin/%%RELEASE%%-usrp_rx_nogui.py -bin/%%RELEASE%%-usrp_siggen.py -bin/%%RELEASE%%-usrp_sounder.py -bin/%%RELEASE%%-usrp_test_counting.py -bin/%%RELEASE%%-usrp_test_loopback.py -bin/%%RELEASE%%-usrper +bin/gpio_rx_sfile.py +bin/gpio_usrp_siggen.py +bin/gpio_usrp_fft.py +bin/gr_plot_char.py +bin/gr_plot_const.py +bin/gr_plot_fft_c.py +bin/gr_plot_fft_f.py +bin/gr_plot_float.py +bin/gr_plot_int.py +bin/gr_plot_iq.py +bin/gr_plot_short.py +bin/usrp_cal_dc_offset +bin/usrp_fft.py +bin/usrp_flex.py +bin/usrp_flex_all.py +bin/usrp_flex_band.py +bin/usrp_oscope.py +bin/usrp_print_db.py +bin/usrp_psr_receiver.py +bin/usrp_ra_receiver.py +bin/usrp_radar_mono.py +bin/usrp_rx_cfile.py +bin/usrp_rx_nogui.py +bin/usrp_siggen.py +bin/usrp_sounder.py +bin/usrp_test_counting.py +bin/usrp_test_loopback.py +bin/usrper etc/gnuradio/gnuradio-core.conf.sample etc/gnuradio/gr-audio-oss.conf.sample etc/gnuradio/gr-wxgui.conf.sample diff --git a/comms/hf/Makefile b/comms/hf/Makefile index a4ac631..ae5256f 100644 --- a/comms/hf/Makefile +++ b/comms/hf/Makefile @@ -20,7 +20,6 @@ RUN_DEPENDS= whiptail:${PORTSDIR}/devel/newt USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} MANLANG= "" "de.ISO8859-1" diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile index ec421f61..ab30b06 100644 --- a/comms/kallers/Makefile +++ b/comms/kallers/Makefile @@ -18,7 +18,6 @@ USE_KDELIBS_VER= 3 USE_GMAKE= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_TARGET= post-patch: @${REINPLACE_CMD} -e 's|@CXXFLAGS@|@CXXFLAGS@ -fPIC|' \ diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index 121de37..ff8b228 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -23,7 +23,6 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm WRKSRC= ${WRKDIR}/${PORTNAME}-0${PORTVERSION} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} USE_GMAKE= yes USE_BZIP2= yes diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile index 5c8edb8f..8bee112 100644 --- a/comms/lirc/Makefile +++ b/comms/lirc/Makefile @@ -22,7 +22,6 @@ USE_XORG= x11 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-sandboxed --with-devdir=/var/run/lirc OPTIONS= IRMAN "Build with libirman support" On diff --git a/comms/qicosi/Makefile b/comms/qicosi/Makefile index cfba4cd..2554e68 100644 --- a/comms/qicosi/Makefile +++ b/comms/qicosi/Makefile @@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-lock-style=open .endif CONFIGURE_ARGS+= --with-config=${CONFDIR}/qico.conf \ --with-default-speed=115200 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} DOCS= Changes FAQ README EXAMPLES= koi8r_866.cp onchat qhistory qico.xpm qlinks sfreq \ diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index 1d73f8b..ab762e6 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= scmxx.1 MANLANG= "" ru de it |