diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
| commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
| tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /audio | |
| parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
| download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip | |
Notes
Diffstat (limited to 'audio')
171 files changed, 305 insertions, 352 deletions
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile index 48bc40347d4d..81a5f0fa3bc0 100644 --- a/audio/adplay/Makefile +++ b/audio/adplay/Makefile @@ -30,7 +30,6 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --sharedstatedir=${DATADIR} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LICENSE= GPLv2 MAN1= adplay.1 diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile index 68352f7665c1..708c4ca08441 100644 --- a/audio/akode-plugins-ffmpeg/Makefile +++ b/audio/akode-plugins-ffmpeg/Makefile @@ -35,7 +35,7 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} USE_LDCONFIG= yes -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile index 59be97be757d..9d970001540b 100644 --- a/audio/akode-plugins-jack/Makefile +++ b/audio/akode-plugins-jack/Makefile @@ -33,7 +33,7 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} USE_LDCONFIG= yes -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile index 4b8847b22ef5..5007c3d4c4b2 100644 --- a/audio/akode-plugins-mpc/Makefile +++ b/audio/akode-plugins-mpc/Makefile @@ -35,7 +35,7 @@ PLIST_FILES= lib/libakode_mpc_decoder.a \ lib/libakode_mpc_decoder.la \ lib/libakode_mpc_decoder.so -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile index 3bbcdda0e189..836f2bad532e 100644 --- a/audio/akode-plugins-mpeg/Makefile +++ b/audio/akode-plugins-mpeg/Makefile @@ -37,7 +37,7 @@ PLIST_FILES= lib/libakode_mpeg_decoder.a \ lib/libakode_mpeg_decoder.la \ lib/libakode_mpeg_decoder.so -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile index 75a5ebf0210c..934b392eada3 100644 --- a/audio/akode-plugins-oss/Makefile +++ b/audio/akode-plugins-oss/Makefile @@ -35,7 +35,7 @@ PLIST_FILES= lib/libakode_oss_sink.a \ lib/libakode_oss_sink.la \ lib/libakode_oss_sink.so -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-pulseaudio/Makefile b/audio/akode-plugins-pulseaudio/Makefile index a50fee9663c5..109b1caa3457 100644 --- a/audio/akode-plugins-pulseaudio/Makefile +++ b/audio/akode-plugins-pulseaudio/Makefile @@ -36,7 +36,7 @@ USE_LDCONFIG= yes PLIST_FILES= lib/libakode_polyp_sink.a lib/libakode_polyp_sink.la \ lib/libakode_polyp_sink.so -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile index deb4ec12dcd4..120a45fe0686 100644 --- a/audio/akode-plugins-resampler/Makefile +++ b/audio/akode-plugins-resampler/Makefile @@ -37,7 +37,7 @@ PLIST_FILES= lib/libakode_src_resampler.a \ lib/libakode_src_resampler.la \ lib/libakode_src_resampler.so -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile index bef06bcb8dcf..d36279c0a852 100644 --- a/audio/akode-plugins-xiph/Makefile +++ b/audio/akode-plugins-xiph/Makefile @@ -41,7 +41,7 @@ PLIST_FILES= lib/libakode_xiph_decoder.a \ lib/libakode_xiph_decoder.la \ lib/libakode_xiph_decoder.so -CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs +LDFLAGS+= -L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 773667bf1ff5..2df875680364 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= JACK "JACK audio support (requires SAMPLERATE)" Off \ LAVC "libavcodec support" Off \ @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-jack .if defined(WITH_LAVC) CONFIGURE_ARGS+= --enable-avcodec -CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg PLIST_SUB+= LAVC="" .else diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index e68033e15dd5..417bc8116f0f 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" +CFLAGS+= -I${LOCALBASE}/include MAN1_EN= aconnect.1 alsactl.1 alsamixer.1 amidi.1 amixer.1 aplay.1 aplaymidi.1 \ arecordmidi.1 aseqdump.1 aseqnet.1 iecset.1 speaker-test.1 @@ -42,11 +42,11 @@ CONFIGURE_ARGS+=--disable-xmlto .endif .if defined(WITHOUT_NLS) -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .else -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" +LDFLAGS+= -L${LOCALBASE}/lib -lintl USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index 7a09f1024fb3..ca3e3dc6d288 100644 --- a/audio/aqualung/Makefile +++ b/audio/aqualung/Makefile @@ -42,9 +42,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-transform-name="" --with-alsa=no --with-ifp=no \ --with-cdda=no -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -lstrfunc +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lstrfunc MAN1= ${PORTNAME}.1 OPTIONS= JACK "Enable JACK low-latency audio server support" Off \ diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile index 911b3aac4f8e..a2f3b21fdd67 100644 --- a/audio/audacity-devel/Makefile +++ b/audio/audacity-devel/Makefile @@ -68,9 +68,7 @@ CPPFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include CXXFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS} CFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - WX_CONFIG="${WX_CONFIG}" +CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" .if !defined(NOPORTDOCS) MAKE_ENV= DOC=yes diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 1ca7f8f0d1cd..57c87d54d364 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -37,9 +37,9 @@ OPTIONS= ID3TAG "ID3 tag support" off \ SSE_CFLAGS= -mno-sse -mno-sse2 .endif -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" +CFLAGS+= -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if !defined(NOPORTDOCS) MAKE_ENV= DOC=yes diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile index 3e2aaea91eb2..834fbe1f8f26 100644 --- a/audio/audiere/Makefile +++ b/audio/audiere/Makefile @@ -20,9 +20,9 @@ WANT_WX= yes USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include/speex -I${LOCALBASE}/include" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include/speex -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= changelog.txt cvs.txt dependencies.txt faq.txt glossary.txt \ license.txt overview.txt readme.txt release-howto.txt \ diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index dffa57c096ab..ec7a4811f7e1 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --enable-own-labels \ --libdir="${LOCALBASE}/lib" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= aumix.1 xaumix.1 mute.1 PLIST_DIRS= share/aumix diff --git a/audio/blop/Makefile b/audio/blop/Makefile index 9a868c287b9a..101dd97a164e 100644 --- a/audio/blop/Makefile +++ b/audio/blop/Makefile @@ -17,13 +17,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-ladspa-prefix="${LOCALBASE}" OPTIONS= NLS "Native language support" on -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile index 744b696ef46d..115330c751b4 100644 --- a/audio/bmp-mac/Makefile +++ b/audio/bmp-mac/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" USE_AUTOTOOLS= autoconf libtool CPPFLAGS+= "-I${LOCALBASE}/include" PLUGDIR= lib/bmp/Input diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile index d5a9670f91ab..c7433a528ae1 100644 --- a/audio/cantus_3/Makefile +++ b/audio/cantus_3/Makefile @@ -30,9 +30,8 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libglade2 glib20 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --program-transform-name="" --disable-static WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//} diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile index da3864b2c9a0..3e83c486a94b 100644 --- a/audio/cowbell/Makefile +++ b/audio/cowbell/Makefile @@ -22,7 +22,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes USE_ICONV= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile index fa10aef9ee9b..daf890c43814 100644 --- a/audio/darkice/Makefile +++ b/audio/darkice/Makefile @@ -26,8 +26,9 @@ OPTIONS= VORBIS "Ogg Vorbis support" on \ USE_AUTOTOOLS= aclocal autoconf GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \ - ac_cv_prog_acx_pthread_config=no +CONFIGURE_ENV= ac_cv_prog_acx_pthread_config=no +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --without-alsa SUB_FILES= pkg-message diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index 3e41f4c9d9e8..5085749ccb4f 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -33,8 +33,8 @@ CONFIGURE_ARGS= --enable-jack \ PORTDOCS= * PORTEXAMPLES= * -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> .include <bsd.port.pre.mk> diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile index 4f62cbb39e81..13e8fb10592d 100644 --- a/audio/dvda-author/Makefile +++ b/audio/dvda-author/Makefile @@ -37,6 +37,5 @@ CONFIGURE_ARGS= --with-flac=${LOCALBASE}/lib/libFLAC.so \ .if defined(NOPORTDOCS) CONFIGURE_ARGS+= --docdir=${WRKDIR}/doc .endif -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .include <bsd.port.mk> diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile index 3d8fed0df6b7..5fe21694a110 100644 --- a/audio/easytag-devel/Makefile +++ b/audio/easytag-devel/Makefile @@ -27,8 +27,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITH_WAVPACK) LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index 9d2f3eeee043..6a2c18d6bb09 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -26,8 +26,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITH_WAVPACK) LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile index 395494fdd7f3..4d5da8528b5c 100644 --- a/audio/ecasound/Makefile +++ b/audio/ecasound/Makefile @@ -27,7 +27,6 @@ LICENSE_COMB= dual USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-pyecasound \ --disable-rubyecasound \ --enable-sys-readline @@ -38,8 +37,8 @@ MAN1= ecaconvert.1 ecafixdc.1 ecalength.1 ecamonitor.1 \ ecasound-iam.1 ecatools.1 MAN5= ecasoundrc.5 -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile index fd9bfe0dcb7c..8cded707ba5f 100644 --- a/audio/ermixer/Makefile +++ b/audio/ermixer/Makefile @@ -27,8 +27,8 @@ USE_PERL5_BUILD= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" -CONFIGURE_ENV+= CPPFLAGS="${PTHREAD_CFLAGS}" +LDFLAGS+= ${PTHREAD_LIBS} +CPPFLAGS+= ${PTHREAD_CFLAGS} PLIST_FILES= bin/ermixer .include <bsd.port.pre.mk> diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile index 8f8d1c0d1bcf..095925ad587e 100644 --- a/audio/espeak/Makefile +++ b/audio/espeak/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= portaudio:${PORTSDIR}/audio/portaudio CONFLICTS= speak-1.[0-9] MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" USE_GMAKE= yes USE_GCC= 4.2+ diff --git a/audio/extace/Makefile b/audio/extace/Makefile index 2bf02deb82d0..bcd95fcf6fed 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 USE_GNOME= esound gnomehack gnomehier gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/extace \ share/gnome/apps/Multimedia/extace.desktop diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile index 983c83065f98..52acd11cbb83 100644 --- a/audio/ezstream/Makefile +++ b/audio/ezstream/Makefile @@ -24,7 +24,6 @@ USE_GNOME= libxml2 USE_ICONV= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= ezstream.1 ezstream-file.sh.1 PORTDOCS= NEWS README @@ -34,8 +33,8 @@ PORTEXAMPLES= ezstream_metadata.xml ezstream_mp3.xml \ ezstream_vorbis.xml meta.sh play.sh PLIST_FILES= bin/ezstream bin/ezstream-file.sh etc/ezstream/ezstream.xml '@dirrm etc/ezstream' -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/audio/faac/Makefile b/audio/faac/Makefile index feedc7e7527a..dbc2d8c0021f 100644 --- a/audio/faac/Makefile +++ b/audio/faac/Makefile @@ -26,8 +26,8 @@ USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing CONFIGURE_ARGS= --with-mp4v2 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes MAN1= faac.1 diff --git a/audio/faad/Makefile b/audio/faad/Makefile index c685df2cc7e7..583d7ba9e38b 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -22,8 +22,8 @@ MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_LDCONFIG= yes MAN1= faad.1 diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile index 4f8d7575d749..c8065cce1aef 100644 --- a/audio/firefly/Makefile +++ b/audio/firefly/Makefile @@ -26,10 +26,10 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \ CONFLICTS= mt-daapd-0.2.* GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS+="${PTHREAD_CFLAGS}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --with-id3tag=${PREFIX} \ --enable-sqlite3 --enable-oggvorbis --enable-flac diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 231fda490bfe..9421588e9884 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --enable-sse \ --with-ogg="${LOCALBASE}" \ --disable-thorough-tests \ --disable-xmms-plugin -CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include" +CPPFLAGS+= -I${WRKSRC}/include MAKE_JOBS_SAFE= yes .if !defined(WITHOUT_ICONV) diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index a3858963a893..4e73aca0ae3c 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -22,7 +22,6 @@ OPTIONS= JACK "Enable Jack audio support" On \ USE_GNOME= glib20 gnomehack pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-alsa-support --disable-midishare \ --disable-coreaudio --disable-coremidi \ --disable-dart --disable-lash \ @@ -31,8 +30,8 @@ USE_LDCONFIG= yes MAN1= fluidsynth.1 -CPPFLAGS= ${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= ${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= ${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= ${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index 05b78001a3cb..d5742251d06c 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -16,7 +16,8 @@ COMMENT= The OpenAL Utility Toolkit USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack USE_OPENAL= al diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile index f05016bbf770..34a0a83af58e 100644 --- a/audio/ghostess/Makefile +++ b/audio/ghostess/Makefile @@ -30,13 +30,12 @@ USE_BZIP2= yes USE_GNOME= gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-jackmidi MAN1= ghostess.1 PLIST_FILES= bin/ghostess bin/ghostess_universal_gui -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile index 7b679ccceec5..11d77a0aefd2 100644 --- a/audio/gigedit/Makefile +++ b/audio/gigedit/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so.3:${PORTSDIR}/audi BUILD_DEPENDS= ${RUN_DEPENDS} GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile index 1a92e0b0fee1..ce2a41512f1a 100644 --- a/audio/gimmix/Makefile +++ b/audio/gimmix/Makefile @@ -37,8 +37,8 @@ MAN1= gimmix.1 CONFIGURE_ENV= DATADIRNAME=share .if !defined(WITHOUT_NLS) -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl CONFIGURE_ARGS+= --enable-nls USE_GETTEXT= yes PLIST_SUB+= NLS="" diff --git a/audio/glame/Makefile b/audio/glame/Makefile index f639a40ecf16..1f46badfa423 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -26,13 +26,12 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl libtool USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - MAKEINFO="makeinfo --no-split" +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" INFO= glame glame-dev -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -lltdl +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lltdl post-extract: @cd ${WRKSRC}/doc && ${RM} -f *.info* diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile index 7f87585b5134..bd25faf89f7f 100644 --- a/audio/gmpc-mserver/Makefile +++ b/audio/gmpc-mserver/Makefile @@ -23,8 +23,8 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack pkgconfig glib20 gtk20 libxml2 USE_GETTEXT= yes diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile index 80e0c267bf23..6fe519078e0b 100644 --- a/audio/gmpc/Makefile +++ b/audio/gmpc/Makefile @@ -28,7 +28,8 @@ USE_GNOME= gnomehack pkgconfig glib20 gtk20 libglade2 INSTALLS_ICONS= yes USE_GETTEXT= yes CONFIGURE_ARGS= --enable-system-libsexy -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gmpc-remote.1 gmpc.1 diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile index 3b0eb575bed3..2dcfa6341f42 100644 --- a/audio/gnapster/Makefile +++ b/audio/gnapster/Makefile @@ -22,8 +22,8 @@ USE_GETTEXT= yes USE_GNOME= imlib WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 9af09efbc863..09616729ef21 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -31,8 +31,8 @@ GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2 USE_GSTREAMER= gconf good CONFIGURE_ARGS= --disable-gstmix -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gnome-audio-profiles.schemas \ gnome-sound-recorder.schemas diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile index 138b9e720421..cde6d6d1b29d 100644 --- a/audio/gnomoradio/Makefile +++ b/audio/gnomoradio/Makefile @@ -26,8 +26,8 @@ USE_GNOME= gnomehack gnomeprefix USE_AUTOTOOLS= libtool USE_LDCONFIG= yes LIBTOOLFLAGS= --tag=CXX -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \ diff --git a/audio/gogo-petit/Makefile b/audio/gogo-petit/Makefile index 965059535f2b..841773723c07 100644 --- a/audio/gogo-petit/Makefile +++ b/audio/gogo-petit/Makefile @@ -25,8 +25,7 @@ AS = nasm AFLAGS = -f elf -Ox ALL_TARGET= test MAKE_ENV+= AS="${AS}" \ - AFLAGS="${AFLAGS}" \ - LDFLAGS="${LDFLAGS}" + AFLAGS="${AFLAGS}" ONLY_FOR_ARCHS= i386 PLIST_FILES= bin/gogo-petit diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile index aa429d30c49c..b72f9fa01e2e 100644 --- a/audio/goobox/Makefile +++ b/audio/goobox/Makefile @@ -28,8 +28,8 @@ USE_GSTREAMER= cdparanoia gconf core GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= goobox.schemas diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index 099aae67e3bd..8d83d7ec1b20 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -34,8 +34,8 @@ USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \ USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS= gqmpeg-0.2* diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index 619ceae8b75a..2dd7823ca662 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -28,8 +28,8 @@ USE_GNOME= gdkpixbuf WANT_GNOME= yes USE_AUTOTOOLS= autoconf213 libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gqmpeg.1 diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile index c369b525cdba..2c9935a5804d 100644 --- a/audio/gqradio/Makefile +++ b/audio/gqradio/Makefile @@ -19,8 +19,8 @@ USE_GNOME= gtk20 gnomehack gnomeprefix ONLY_FOR_ARCHS= alpha i386 ia64 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|\(doc/gqradio\)-\$$VERSION|\1|' \ diff --git a/audio/grip/Makefile b/audio/grip/Makefile index 20ea1bb3c1b3..d971c0c2744d 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -21,8 +21,8 @@ USE_XORG= x11 USE_GNOME= gnomehack gnomeprefix libgnomeui vte USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= CDPARANOIA "Ripper: Enable cdparanoia support" on \ CDDA2WAV "Ripper: cdda2wav: Install sysutils/cdrtools" off diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile index 67dc7fb05095..06e5703a5a64 100644 --- a/audio/gspeakers/Makefile +++ b/audio/gspeakers/Makefile @@ -20,8 +20,8 @@ USE_GNOME= gnomeprefix libxml2 USE_GMAKE= yes USE_AUTOTOOLS= automake:env GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -O0 diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile index ed5c359a42fb..cb67018886b0 100644 --- a/audio/gtick/Makefile +++ b/audio/gtick/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ GNU_CONFIGURE= yes USE_GNOME= gtk20 -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gtick.1 diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile index 64a8889793fc..031427f2212f 100644 --- a/audio/gtkpod/Makefile +++ b/audio/gtkpod/Makefile @@ -22,7 +22,8 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gtk20 libglade2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes MAN1= gtkpod.1 diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile index dab21d034813..22a5cc6f5874 100644 --- a/audio/hawkvoice/Makefile +++ b/audio/hawkvoice/Makefile @@ -20,10 +20,9 @@ USE_GMAKE= yes MAKEFILE= makefile.linux USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \ - MAKE="${GMAKE}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +MAKE_ENV= MAKE="${GMAKE}" WRKSRC= ${WRKDIR}/HawkVoiceDI/src diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile index 68907a59c2ee..4d7e9049abfe 100644 --- a/audio/icecast2/Makefile +++ b/audio/icecast2/Makefile @@ -30,7 +30,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_RC_SUBR= icecast2.sh SUB_FILES+= pkg-message -CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include +CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} +CFLAGS+= -I${LOCALBASE}/include DOCSDIR= ${PREFIX}/share/doc/icecast WRKSRC= ${WRKDIR}/icecast-${PORTVERSION} diff --git a/audio/ices/Makefile b/audio/ices/Makefile index d0df6f024ad3..e428aad126d3 100644 --- a/audio/ices/Makefile +++ b/audio/ices/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= shout.5:${PORTSDIR}/audio/libshout2 \ vorbis.4:${PORTSDIR}/audio/libvorbis \ xml2.5:${PORTSDIR}/textproc/libxml2 -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib USE_GMAKE= yes GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile index 5151ad92eeb0..fc6fe77eb439 100644 --- a/audio/ices0/Makefile +++ b/audio/ices0/Makefile @@ -22,8 +22,8 @@ OPTIONS= FLAC "Enable flac transcoding support" Off \ VORBIS "Enable ogg/vorbis transcoding support" Off \ PYTHON "Enable Python scripting" On -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index 22eaa979cee2..a2d5c2daefcc 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -17,11 +17,10 @@ COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags USE_AUTOTOOLS= libtool USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-extract: @${RM} -rf ${WRKSRC}/zlib diff --git a/audio/istream/Makefile b/audio/istream/Makefile index df49665b4bac..0ed81511919b 100644 --- a/audio/istream/Makefile +++ b/audio/istream/Makefile @@ -20,7 +20,7 @@ USE_GSTREAMER= yes USE_XORG= xtst GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}c -CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" +CPPFLAGS+= `pkg-config --cflags libgnomeui-2.0` MAKE_JOBS_SAFE= yes post-patch: diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile index 9f18af491106..5aa45703a026 100644 --- a/audio/jack-rack/Makefile +++ b/audio/jack-rack/Makefile @@ -24,8 +24,8 @@ USE_GNOME= libgnomeui libxml2 USE_GETTEXT= yes USE_PYTHON= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-ladcca --disable-lash post-patch: diff --git a/audio/jack/Makefile b/audio/jack/Makefile index a61da5970a5f..d1a72be8c8db 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -24,7 +24,7 @@ LIBS+= ${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LIBS="${LIBS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= LIBS="${LIBS}" CONFIGURE_ARGS+=--enable-portaudio \ --with-default-tmpdir=/tmp GNU_CONFIGURE= yes diff --git a/audio/julius/Makefile b/audio/julius/Makefile index ddc7e4749005..e590971d521c 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -21,8 +21,8 @@ MANCOMPRESSED= no GNU_CONFIGURE= yes USE_ICONV= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv MANLANG= "" ja MAN1= accept_check.1 \ adinrec.1 \ diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile index 35803218205e..91ff00510283 100644 --- a/audio/ksmp3play/Makefile +++ b/audio/ksmp3play/Makefile @@ -21,12 +21,11 @@ NO_WRKSUBDIR= yes USE_GNOME= gnomehack USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= ksmp3play.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-install: .if !defined(NOPORTDOCS) diff --git a/audio/lash/Makefile b/audio/lash/Makefile index 62981351f7c9..c1305cdf072a 100644 --- a/audio/lash/Makefile +++ b/audio/lash/Makefile @@ -25,12 +25,11 @@ USE_GNOME= gnomehack gtk20 libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa-midi -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -CPPFLAGS= -I${LOCALBASE}/include/dssi -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include/dssi -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index c9bec52c1a04..51bb0b4d05ba 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -29,8 +29,8 @@ USE_LDCONFIG= yes BUILD_DEPENDS+= ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft RUN_DEPENDS+= ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-djbfft .endif diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index bd094df89ad8..41c53afc0de7 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -23,8 +23,8 @@ USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool libltdl CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(SLAVEPORT) GCONF_SCHEMAS= libcanberra.schemas diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile index 40e51ac80887..41a7afd0f493 100644 --- a/audio/libcddb/Makefile +++ b/audio/libcddb/Makefile @@ -21,7 +21,7 @@ USE_GNOME= gnomehack pkgconfig USE_ICONV= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --without-cdio -CONFIGURE_ENV= CPPFLAGS="-DICONV_CONST=\"const\" -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -DICONV_CONST="const" -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index 4977af94a515..824d23b8ac97 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -25,8 +25,8 @@ USE_GNOME= gtk20 USE_SQLITE= 3 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-hal --with-html-dir="${PREFIX}/share/doc" OPTIONS= IMOBILE "Support Apple iPhone/iPod Touch" on \ diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile index b5f4e7e82d99..db993d345553 100644 --- a/audio/libmp3splt/Makefile +++ b/audio/libmp3splt/Makefile @@ -81,6 +81,6 @@ PLIST_FILES+= "@dirrmtry share/locale/de_DE" .endif CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.post.mk> diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile index 645733199bd2..ecd8c00e43b4 100644 --- a/audio/libmtp/Makefile +++ b/audio/libmtp/Makefile @@ -16,14 +16,13 @@ COMMENT= Media Transfer Protocol (MTP) library LICENSE= LGPL21 GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" USE_GNOME= gnomehack USE_LDCONFIG= yes USE_ICONV= yes MAKE_JOBS_SAFE= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -liconv +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv .include <bsd.port.pre.mk> .if ${OSVERSION} < 800069 diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile index 5ace2bcda830..760b240ece34 100644 --- a/audio/libmusicbrainz/Makefile +++ b/audio/libmusicbrainz/Makefile @@ -22,8 +22,8 @@ CONFLICTS= musicbrainz-1.* USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile index 890cc871718b..d6e0cde1a860 100644 --- a/audio/libnjb/Makefile +++ b/audio/libnjb/Makefile @@ -15,8 +15,8 @@ COMMENT= C library, API for communicating with Creative and Dell audio players USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile index bbf0f6056d12..3d939d6dfac3 100644 --- a/audio/libofa/Makefile +++ b/audio/libofa/Makefile @@ -23,8 +23,8 @@ USE_DOS2UNIX= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile index 3d6c175b73a0..e4c99fc531f0 100644 --- a/audio/libshout2/Makefile +++ b/audio/libshout2/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ theora.0:${PORTSDIR}/multimedia/libtheora \ vorbis.4:${PORTSDIR}/audio/libvorbis -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib USE_LDCONFIG= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index 843e86e9479d..6681e86175a3 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --disable-gcc-pipe \ --disable-alsa \ --disable-octave CPPFLAGS+= -isystem /usr/include -isystem ${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes MAN1= sndfile-concat.1 sndfile-cmp.1 sndfile-convert.1 \ diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile index 9e883cbdcd20..72e3fa80d337 100644 --- a/audio/libtunepimp-old/Makefile +++ b/audio/libtunepimp-old/Makefile @@ -31,8 +31,8 @@ USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv USE_LDCONFIG= ${PREFIX}/lib/tunepimp-0.4 post-patch: diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile index 501f379976f0..4cfd496f22f0 100644 --- a/audio/libtunepimp/Makefile +++ b/audio/libtunepimp/Makefile @@ -31,8 +31,8 @@ CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv USE_LDCONFIG= yes post-patch: diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile index 375de399104b..6ef8a32fd1ac 100644 --- a/audio/linuxsampler/Makefile +++ b/audio/linuxsampler/Makefile @@ -32,19 +32,19 @@ USE_GNOME= gnomehack USE_SQLITE= 3 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" HAVE_UNIX98=1 +CONFIGURE_ENV= HAVE_UNIX98=1 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes MAN1= linuxsampler.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> .if defined(WITHOUT_JACK) -CONFIGURE_ARGS+=--disable-jack-driver +CONFIGURE_ARGS+=--disable-jack-driver .else LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .endif @@ -66,7 +66,7 @@ BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi PLIST_SUB+= DSSI="" .else -CONFIGURE_ENV+= ac_cv_header_dssi_h=no +CONFIGURE_ENV+= ac_cv_header_dssi_h=no PLIST_SUB+= DSSI="@comment " .endif diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile index 1ddc3cec6c3f..45edc4f33fae 100644 --- a/audio/liteamp/Makefile +++ b/audio/liteamp/Makefile @@ -29,8 +29,8 @@ MAKE_JOBS_SAFE= yes MAN1= liteamp.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile index 01cc4051bdd2..61a905dc9bb3 100644 --- a/audio/madplay/Makefile +++ b/audio/madplay/Makefile @@ -24,7 +24,7 @@ LICENSE= GPLv2 WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib ALL_TARGET= all madtime MAN1= abxtest.1 madplay.1 diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile index 6762d76a6ac8..3e14227f6cca 100644 --- a/audio/mangler/Makefile +++ b/audio/mangler/Makefile @@ -25,7 +25,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-alsa USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile index 804c39ac119f..7f97708ea5ba 100644 --- a/audio/mhwaveedit/Makefile +++ b/audio/mhwaveedit/Makefile @@ -21,8 +21,8 @@ USE_GNOME= gnomehack gtk20 WANT_GNOME= yes WANT_SDL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-optimization --without-alsalib PLIST_FILES= bin/mhwaveedit \ diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile index 986408e46c3c..905778509b61 100644 --- a/audio/milkytracker/Makefile +++ b/audio/milkytracker/Makefile @@ -25,7 +25,6 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --disable-alsatest --without-alsa LICENSE= GPLv3 diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile index 556422fc265f..e0b259a23fd2 100644 --- a/audio/mixmos/Makefile +++ b/audio/mixmos/Makefile @@ -16,8 +16,8 @@ COMMENT= A GTK2 audio mixer USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= mixmos.1 diff --git a/audio/moc/Makefile b/audio/moc/Makefile index 103862735ca7..e9bdc28c063c 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -18,12 +18,11 @@ USE_GMAKE= yes USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= mocp.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= JACK "JACK support" off \ MP3 "MP3 support" on \ diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile index 5fa30840bd0b..d46bca3daecd 100644 --- a/audio/mp3_check/Makefile +++ b/audio/mp3_check/Makefile @@ -14,8 +14,6 @@ MASTER_SITES= SF/mp3check/mp3check/${PORTVERSION} MAINTAINER= ericb@thedeepsky.com COMMENT= Verifies the integrity of mp3 audio files -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/mp3_check .include <bsd.port.mk> diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index 7a47eeeb8790..1d6737f92390 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -17,14 +17,13 @@ COMMENT= MP3 console ncurses-based player USE_GMAKE= yes GNU_CONFIGURE= yes WANT_GNOME= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}" MAKE_JOBS_SAFE= yes MAN1= mp3blaster.1 nmixer.1 splay.1 -CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} OPTIONS= LIRC "LIRC support" off \ SIDPLAY "Sidplayer support" on \ diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile index eb476f94a5ee..1be756156e47 100644 --- a/audio/mp3plot/Makefile +++ b/audio/mp3plot/Makefile @@ -22,15 +22,14 @@ OPTIONS= GD "Enable support for GD library" on \ LICENSE= GPLv2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \ --with-boost-thread=boost_thread MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile index cb473d5ec406..a3529af19732 100644 --- a/audio/mp3splt-gtk/Makefile +++ b/audio/mp3splt-gtk/Makefile @@ -23,8 +23,8 @@ LIB_DEPENDS= mp3splt:${PORTSDIR}/audio/libmp3splt \ USE_AUTOTOOLS= libltdl USE_GSTREAMER= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-audacious --with-mp3splt=${LOCALBASE} --with-mp3splt-includes=${LOCALBASE}/include --with-mp3splt-libraries=${LOCALBASE}/lib --disable-mp3splttest MAN1= mp3splt-gtk.1 diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile index 7ca59c1eca10..51d769177d54 100644 --- a/audio/mp3splt/Makefile +++ b/audio/mp3splt/Makefile @@ -17,7 +17,8 @@ LIB_DEPENDS= mp3splt:${PORTSDIR}/audio/libmp3splt USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-oggsplt_symlink --disable-mp3splttest CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index f5557b2c1a8c..feba36790313 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -22,8 +22,6 @@ GNU_CONFIGURE= yes USE_GNOME= pkgconfig LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" PORTDOCS= AUTHORS README NEWS diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 26bb94195010..2e2e08ec6886 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -25,8 +25,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-optimization=0 \ --with-audio=oss \ --with-default-audio=oss -CONFIGURE_ENV= CONFIG_SHELL=${SH} CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CONFIG_SHELL=${SH} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= mpg123.1 diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile index f8a1e70f04da..bd0e14949047 100644 --- a/audio/mpg321/Makefile +++ b/audio/mpg321/Makefile @@ -31,8 +31,8 @@ MPG321_SCROBBLER_PLUGIN_NAME?= 321 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-mpg123-symlink -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes MAN1= mpg321.1 diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile index 3b3e7a09a781..0bde42fbd6c0 100644 --- a/audio/mpiosh/Makefile +++ b/audio/mpiosh/Makefile @@ -22,8 +22,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= aclocal automake autoconf libtool ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv .include <bsd.port.pre.mk> diff --git a/audio/muine/Makefile b/audio/muine/Makefile index 4fb98f5d3eba..921434535078 100644 --- a/audio/muine/Makefile +++ b/audio/muine/Makefile @@ -32,8 +32,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= muine.schemas diff --git a/audio/muse/Makefile b/audio/muse/Makefile index 5824ff5e2a55..344de13d744f 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -23,11 +23,10 @@ USE_GETTEXT= yes USE_GMAKE= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath -CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \ +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \ ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl OPTIONS= X11 "Build with X11 support" on \ MP3 "Build with MP3 support" on \ diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile index 234cae1f4fa8..ade54ec00587 100644 --- a/audio/musicbox-tag-editor/Makefile +++ b/audio/musicbox-tag-editor/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib USE_GNOME= gnomehack gnomeprefix libglade2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib # do not conflict with audio/musicbox CONFIGURE_ARGS= --program-suffix=-tag-editor diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index f418221d9d55..942a34b7bdfd 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -25,8 +25,8 @@ GNU_CONFIGURE= yes USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${PREFIX}/include diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index ac470234abe0..ed413c551259 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient GNU_CONFIGURE= yes USE_GNOME= glib20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= NLS "Native language support" on \ LYRICS "Compile with lyrics screen" on diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 93fa743ed4c7..d3a462d66332 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -24,8 +24,8 @@ USE_NCURSES= yes USE_GNOME= glib20 USE_AUTOTOOLS= automake aclocal libtool ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lpthread" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAN1= ncmpcpp.1 MAKE_JOBS_SAFE= yes diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile index 31b5ae296d50..fc99f6d67d60 100644 --- a/audio/normalize/Makefile +++ b/audio/normalize/Makefile @@ -18,10 +18,9 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-helper-search -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= normalize.1 normalize-mp3.1 diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile index 7944ca9dac3f..b86813b22c91 100644 --- a/audio/nosefart/Makefile +++ b/audio/nosefart/Makefile @@ -18,8 +18,7 @@ COMMENT= A player for NES Sound Format (NSF) USE_GMAKE= yes MAKE_ENV= INSTALL="${INSTALL}" COPY="${COPY}" STRIP="${STRIP}"\ - BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}"\ - LDFLAGS="${LDFLAGS}" + BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}" PLIST_FILES= bin/nosefart pre-build: diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index 4bbd86026d16..dbcde6452bd7 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -33,13 +33,8 @@ WANT_GNOME= desktopfileutils CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -L${LOCALBASE}/lib -CXXFLAGS+= -L${LOCALBASE}/lib - -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CFLAGS+= -L${LOCALBASE}/lib ${CPPFLAGS} +CXXFLAGS+= -L${LOCALBASE}/lib ${CPPFLAGS} CONFIGURE_ARGS= --with-dir-suffix="" \ --without-alsa \ diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index ad065d0adf78..b76854dcfed3 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -29,7 +29,7 @@ OPTIONS= PULSEAUDIO "Enable sound streaming using PulseAudio" off .if defined(WITH_PULSEAUDIO) LIB_DEPENDS+= pulse-simple.0:${PORTSDIR}/audio/pulseaudio CFLAGS+= -Iinclude -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DPULSEAUDIO:BOOL=ON .else CMAKE_ARGS+= -DPULSEAUDIO:BOOL=OFF diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 1988cceccaef..f5ef3db839d8 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -19,7 +19,8 @@ CONFLICTS= openal-soft-[0-9]* USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-capture USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack diff --git a/audio/orpheus/Makefile b/audio/orpheus/Makefile index c253162f41fe..567c2d0ba7d6 100644 --- a/audio/orpheus/Makefile +++ b/audio/orpheus/Makefile @@ -24,7 +24,7 @@ HAS_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= NLS "Native language support" on \ CDDB "CDDB audio CD' auto fetch track info support" on \ diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile index ac021f6e347f..d299fd420bd3 100644 --- a/audio/osalp/Makefile +++ b/audio/osalp/Makefile @@ -21,9 +21,8 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ GNU_CONFIGURE= yes CFLAGS+= -fPIC -DPIC -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-all USE_LDCONFIG= yes diff --git a/audio/pd/Makefile b/audio/pd/Makefile index fc3b40717117..e8537ff94558 100644 --- a/audio/pd/Makefile +++ b/audio/pd/Makefile @@ -24,14 +24,13 @@ USE_TK_BUILD= yes USE_TK_WRAPPER= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" MAKEFILE= makefile MAKE_JOBS_UNSAFE= yes MAN1= pd.1 pdreceive.1 pdsend.1 -CPPFLAGS= -I${TCL_INCLUDEDIR} -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${TCL_INCLUDEDIR} +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/audio/pidgin-musictracker/Makefile b/audio/pidgin-musictracker/Makefile index 01b6cd0aea78..f7780abe08a3 100644 --- a/audio/pidgin-musictracker/Makefile +++ b/audio/pidgin-musictracker/Makefile @@ -22,6 +22,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= "CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile index 9fbd73ccffd9..06f0c37e6b72 100644 --- a/audio/playgsf/Makefile +++ b/audio/playgsf/Makefile @@ -28,8 +28,8 @@ CFLAGS+= -O0 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= LIBS="${LDFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}" LIBS="${LDFLAGS}" CFLAGS="${CFLAGS}" +MAKE_ENV+= LIBS="${LDFLAGS}" +CONFIGURE_ENV+= LIBS="${LDFLAGS}" PLIST_FILES= bin/playgsf diff --git a/audio/pms/Makefile b/audio/pms/Makefile index e8ba7485fc3d..7ae359fb6ac2 100644 --- a/audio/pms/Makefile +++ b/audio/pms/Makefile @@ -23,7 +23,7 @@ USE_GNOME= glib20 MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile index 621e1d6a241f..60b9bbd91a71 100644 --- a/audio/pocketsphinx/Makefile +++ b/audio/pocketsphinx/Makefile @@ -19,8 +19,8 @@ USE_LDCONFIG= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 6ac9afc12d6e..8057703cedb0 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -34,13 +34,13 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl libtool USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ OPENSSL_CFLAGS="-I/usr/include" \ OPENSSL_LIBS="-lcrypto -lssl" \ LIBS="-lm -lintl" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var \ --with-database=gdbm \ diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile index e662d165eeb8..46ebaa67dd3c 100644 --- a/audio/py-pyliblo/Makefile +++ b/audio/py-pyliblo/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= lo.7:${PORTSDIR}/audio/liblo USE_PYTHON= yes USE_PYDISTUTILS= yes -MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \ - LDFLAGS="-L${LOCALBASE}/lib" +MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} +LDFLAGS+= -L${LOCALBASE}/lib MAN1= dump_osc.1 send_osc.1 diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile index 9a996384a452..281a5263842c 100644 --- a/audio/q-audio/Makefile +++ b/audio/q-audio/Makefile @@ -28,6 +28,5 @@ DATADIR= ${PREFIX}/share/q CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" .include <bsd.port.mk> diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile index 7dc178f1c5de..e4caf5b4c829 100644 --- a/audio/raop_play/Makefile +++ b/audio/raop_play/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321 \ flac:${PORTSDIR}/audio/flac GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="`fltk-config --ldflags`" +LDFLAGS+= `fltk-config --ldflags` USE_GMAKE= yes USE_GNOME= glib20 diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile index 2903cd9d1e85..6dec765b48f1 100644 --- a/audio/rezound/Makefile +++ b/audio/rezound/Makefile @@ -20,7 +20,8 @@ LIB_DEPENDS= FOX-1.4:${PORTSDIR}/x11-toolkits/fox14 USE_BISON= build GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-alsa OPTIONS= LARGEFILE "Enable 64-bit I/O support (not yet!)" off \ diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 500823bc373e..e9912b3ee580 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -41,9 +41,10 @@ CONFIGURE_ARGS= --disable-vala --with-libbrasero-media \ --without-libnautilus-burn INSTALLS_ICONS= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LIBS="-lm" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV= LIBS="-lm" + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= rhythmbox.schemas diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile index e6a902843b15..4bc0fc8d0577 100644 --- a/audio/rioutil/Makefile +++ b/audio/rioutil/Makefile @@ -17,13 +17,12 @@ COMMENT= A program to inferface with the Rio600, Rio800, and psa[play devices USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes MAN1= rioutil.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index e7669bf8b235..b039c6ced9a8 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -32,7 +32,7 @@ QT_COMPONENTS= gui xml network corelib sql qt3support \ rcc_build moc_build uic_build linguist_build LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= QTLIBDIR=${QT_LIBDIR} LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= QTLIBDIR=${QT_LIBDIR} GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes INSTALLS_ICONS= yes diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 313ef8bdde1d..926ef506c6cd 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAN1= rplay.1 rptp.1 MAN5= rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplay.servers.5 diff --git a/audio/ruby-xmms/Makefile b/audio/ruby-xmms/Makefile index 927c1d77c29e..3a337f016d65 100644 --- a/audio/ruby-xmms/Makefile +++ b/audio/ruby-xmms/Makefile @@ -26,7 +26,9 @@ INSTALL_TARGET= site-install DOCS= AUTHORS COPYING ChangeLog README doc -CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" post-install: .if !defined(NOPORTDOCS) diff --git a/audio/schism/Makefile b/audio/schism/Makefile index 4cfaa4febd14..cda88e196462 100644 --- a/audio/schism/Makefile +++ b/audio/schism/Makefile @@ -22,11 +22,6 @@ USE_BZIP2= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" - LICENSE= GPLv2 PLIST_FILES= bin/${PORTNAME} diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile index 57f9a5d5f037..e7f2805eb5b5 100644 --- a/audio/scrobbler/Makefile +++ b/audio/scrobbler/Makefile @@ -24,7 +24,8 @@ CONFLICTS= bmp-scrobbler-[0-9]* \ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib SLAVEDIRS= audio/xmms-scrobbler audio/bmp-scrobbler diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 6fa1868c9e7a..789b0c9fea13 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -20,9 +20,9 @@ USE_SDL= sdl USE_GNOME= pkgconfig gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\" +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/etc/timidity.cfg\" USE_LDCONFIG= yes OPTIONS= MIKMOD "Enable MOD music via libMikMod" On \ diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile index de26ec62d0ac..5811f72f8299 100644 --- a/audio/sdl_sound/Makefile +++ b/audio/sdl_sound/Makefile @@ -19,7 +19,8 @@ COMMENT= A SDL audio library and player for some popular sound file formats USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_SDL= sdl -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= FLAC "Enable FLAC decoding support" on \ MIKMOD "Enable MOD decoding support using mikmod" on \ diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile index 830abf78d7f0..d917c44cba8a 100644 --- a/audio/sidplayer/Makefile +++ b/audio/sidplayer/Makefile @@ -22,11 +22,6 @@ MAKE_JOBS_SAFE= yes SDLINCLUDEDIR= SDL -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" - LICENSE= GPLv2 post-patch: diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile index fe6b1322d9b5..1c660af5ffa4 100644 --- a/audio/smasher/Makefile +++ b/audio/smasher/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFIGURE_ARGS= --with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_XORG= x11 USE_LDCONFIG= yes diff --git a/audio/snd/Makefile b/audio/snd/Makefile index b67e54b7677a..b7276277c5eb 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -26,7 +26,6 @@ OPTIONS= ESD "Use Enlightened Sound Daemon" on \ WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-float-samples MAKEFILE= makefile ALL_TARGET= audinfo snd snd-info sndplay @@ -35,8 +34,8 @@ MAKE_JOBS_UNSAFE= yes MAN1= snd.1 CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 438bb154dc80..2577f7c8516c 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -33,8 +33,8 @@ USE_GSTREAMER= cdparanoia vorbis flac gconf good gio GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-ignore-missing-cd INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= sound-juicer.1 GCONF_SCHEMAS= sound-juicer.schemas diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index 7bb82811c120..83fec706b8e6 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile USE_GNOME= esound gdkpixbuf gnomehack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= GNOME "use GNOME 1.x (enables envelope editors)" off \ I386_ASM "i386 asm optimizations (potentially unstable)" off \ diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 7229e4ddd5c0..7b992ba99497 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -54,7 +54,6 @@ OPTIONS= ALSA "ALSA output driver" off \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}" diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 3a8af4b84771..e9a3807accaa 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= speexdec.1 speexenc.1 diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile index 2a293443d7bf..a6877c2ba311 100644 --- a/audio/sphinx3/Makefile +++ b/audio/sphinx3/Makefile @@ -19,8 +19,8 @@ USE_LDCONFIG= yes USE_GMAKE= yes USE_AUTOTOOLS=libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile index 1fa33b31ede9..1828081f8526 100644 --- a/audio/sphinxbase/Makefile +++ b/audio/sphinxbase/Makefile @@ -20,8 +20,8 @@ USE_GMAKE= yes USE_GNOME= gnomehack USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile index e55ac7078fbb..55f6898f8ac1 100644 --- a/audio/spiralsynthmodular/Makefile +++ b/audio/spiralsynthmodular/Makefile @@ -24,8 +24,8 @@ USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile index b64114b05c65..9368b99ab2d9 100644 --- a/audio/streamripper/Makefile +++ b/audio/streamripper/Makefile @@ -29,7 +29,6 @@ LICENSE= GPLv2 USE_GNOME= glib20 USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --without-included-libmad \ --without-included-tre \ --with-included-argv \ @@ -39,8 +38,8 @@ MAN1= streamripper.1 PLIST_FILES= bin/streamripper CFLAGS+= -DANSI_PROTOTYPES -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib CDK_VERSION= 5.0-20060507 diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile index bde7d2fd87b9..2a4351690ba8 100644 --- a/audio/streamtranscoder/Makefile +++ b/audio/streamtranscoder/Makefile @@ -21,7 +21,8 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \ mp3lame:${PORTSDIR}/audio/lame GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/streamTranscoder PORTDOCS= AUTHORS README diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index 589a7b12ea30..b3954bf77e57 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -23,9 +23,8 @@ USE_GNOME= gtk20 gnomehack gnomeprefix USE_GMAKE= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= SHOUTCAST "SHOUTcast plugin" on \ LIVE365 "Live365 plugin" on \ diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 701bc86e0ded..c8178a6644d5 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -26,8 +26,8 @@ USE_GNOME= gnomehack gtk20 USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ --with-extraincdir=${LOCALBASE}/include \ --with-vorbis-libraries=${LOCALBASE}/lib \ diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile index 2326b384cd83..4ac8098ce809 100644 --- a/audio/swhplugins/Makefile +++ b/audio/swhplugins/Makefile @@ -25,9 +25,8 @@ ONLY_FOR_ARCHS= i386 amd64 USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes CFLAGS+= -fPIC -DPIC diff --git a/audio/tagger/Makefile b/audio/tagger/Makefile index 9d0f098c0479..463cb192274f 100644 --- a/audio/tagger/Makefile +++ b/audio/tagger/Makefile @@ -18,8 +18,8 @@ USE_BZIP2= yes USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/tagger diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile index 699a117585d1..75256cd798dc 100644 --- a/audio/tagtool/Makefile +++ b/audio/tagtool/Makefile @@ -22,11 +22,10 @@ USE_GNOME= gnomehack intlhack libglade2 USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_ICONS= yes -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile index 97fb5711aa3e..4af5303933c8 100644 --- a/audio/terminatorx/Makefile +++ b/audio/terminatorx/Makefile @@ -34,7 +34,6 @@ USE_GNOME= gnomehack gnomehier gtk20 libxml2 USE_GMAKE= yes USE_AUTOTOOLS= aclocal autoheader automake autoconf ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-alsa \ --disable-alsamidi \ --disable-scheduler @@ -42,8 +41,8 @@ INSTALLS_OMF= yes MAN1= terminatorX.1 -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile index b41812415679..7214088b3bb0 100644 --- a/audio/timidity++/Makefile +++ b/audio/timidity++/Makefile @@ -40,7 +40,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*' \ CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \ --program-transform-name= --enable-network CPPFLAGS+= -I${LOCALBASE}/include/libarc -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS=-export-dynamic +LDFLAGS+= -export-dynamic DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf DOCLANG= C ja_JP.eucJP diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface index 6ac79d078d9c..0eeb8bc0589d 100644 --- a/audio/timidity++/Makefile.interface +++ b/audio/timidity++/Makefile.interface @@ -25,7 +25,7 @@ PKGMESSAGE= ${NONEXISTENT} .endif CONFIGURE_ENV+= SHLD="${CC} -shared ${LDFLAGS}" -LDFLAGS= -export-dynamic +LDFLAGS+= -export-dynamic CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE} diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile index b9872371d7c6..48a30440e4da 100644 --- a/audio/tse3/Makefile +++ b/audio/tse3/Makefile @@ -16,7 +16,8 @@ COMMENT= A MIDI library USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --without-doc-install -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile index 0b94be5f15c8..433d71207cba 100644 --- a/audio/umodplayer/Makefile +++ b/audio/umodplayer/Makefile @@ -22,13 +22,12 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libaiff.a:${PORTSDIR}/audio/libaiff HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile index bb856dd9bf0b..cfb8aef8c569 100644 --- a/audio/vagalume/Makefile +++ b/audio/vagalume/Makefile @@ -34,8 +34,8 @@ OPTIONS= DBUS "Build with DBUS support" on \ .if !defined(WITHOUT_NLS) USE_GETTEXT= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index e64372167b32..2e795460f53f 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -23,10 +23,10 @@ LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \ vorbis.4:${PORTSDIR}/audio/libvorbis GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes .if !defined(WITHOUT_NLS) diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile index 3aab50d6d5f5..f5246f9f96cc 100644 --- a/audio/vorbisgain/Makefile +++ b/audio/vorbisgain/Makefile @@ -18,8 +18,8 @@ COMMENT= Calculates the perceived sound level of an Ogg Vorbis file LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= vorbisgain.1 PLIST_FILES= bin/vorbisgain diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile index d47088cab255..79a93ac01873 100644 --- a/audio/wavbreaker/Makefile +++ b/audio/wavbreaker/Makefile @@ -18,9 +18,9 @@ OPTIONS= PULSE "Pulseaudio soundserver support" OFF USE_GNOME= gnomehack gtk20 libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PKG_CONFIG="${LOCALBASE}/bin/pkg-config" +CONFIGURE_ENV= PKG_CONFIG="${LOCALBASE}/bin/pkg-config" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-alsa INSTALLS_ICONS= yes diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile index 92f23817a255..33c18584a16a 100644 --- a/audio/wavpack/Makefile +++ b/audio/wavpack/Makefile @@ -20,8 +20,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" OPTIONS= MMX "Enable MMX optimizations (x86 only)" Off diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile index 9595584c4e3f..307d6746099c 100644 --- a/audio/whysynth/Makefile +++ b/audio/whysynth/Makefile @@ -27,9 +27,8 @@ USE_BZIP2= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index 8b87555e940a..51edf6882143 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -25,7 +25,7 @@ USE_AUTOTOOLS= libtool WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/WINGs" +CPPFLAGS+= -I${LOCALBASE}/include/WINGs CONFIGURE_ARGS+=--x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-libs-from=-L${LOCALBASE}/lib \ diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile index 4d84ddc7c6d4..4f1dc1c778e7 100644 --- a/audio/wxguitar/Makefile +++ b/audio/wxguitar/Makefile @@ -21,7 +21,8 @@ GNU_CONFIGURE= yes USE_WX= 2.8+ WX_UNICODE= yes CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/wxGuitar diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile index bfaa99342bb1..26e4b4e47e4e 100644 --- a/audio/xmms-ahx/Makefile +++ b/audio/xmms-ahx/Makefile @@ -26,7 +26,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gtk12 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LICENSE= GPLv2 diff --git a/audio/xmms-audiofile/Makefile b/audio/xmms-audiofile/Makefile index 02c7139ffa26..930e026575e1 100644 --- a/audio/xmms-audiofile/Makefile +++ b/audio/xmms-audiofile/Makefile @@ -24,8 +24,8 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \ - LIBS="${LIBS} ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS}" +CFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS} post-patch: @${REINPLACE_CMD} -e \ diff --git a/audio/xmms-cdread/Makefile b/audio/xmms-cdread/Makefile index d56b42940961..258dfd6bb0f8 100644 --- a/audio/xmms-cdread/Makefile +++ b/audio/xmms-cdread/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" +CFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= lib/xmms/Input/libcdread.so lib/xmms/Input/libcdread.la diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile index 267613091bcf..78f35274691e 100644 --- a/audio/xmms-crossfade/Makefile +++ b/audio/xmms-crossfade/Makefile @@ -34,7 +34,6 @@ CONFIGURE_ARGS+= --enable-player=${APP} LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--enable-samplerate .endif diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile index 79141417cd07..3fe67217234a 100644 --- a/audio/xmms-fc/Makefile +++ b/audio/xmms-fc/Makefile @@ -25,15 +25,14 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms USE_BZIP2= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ - ac_cv_lib_fc14audiodecoder_fc14dec_new=yes +CONFIGURE_ENV= ac_cv_lib_fc14audiodecoder_fc14dec_new=yes CONFIGURE_ARGS= --disable-gtktest USE_LDCONFIG= yes PLIST_FILES= lib/xmms/Input/fcdecoder.so lib/xmms/Input/fcdecoder.la -CPPFLAGS= -I${WRKDIR}/${LIBFC_DISTNAME}/src -LDFLAGS= -L${WRKDIR}/${LIBFC_DISTNAME}/src/.libs -lstdc++ +CPPFLAGS+= -I${WRKDIR}/${LIBFC_DISTNAME}/src +LDFLAGS+= -L${WRKDIR}/${LIBFC_DISTNAME}/src/.libs -lstdc++ LIBFC_PORTNAME= libfc14audiodecoder LIBFC_PORTVERSION= 1.0.2 diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile index e462117a49b7..855256a94b8d 100644 --- a/audio/xmms-jack/Makefile +++ b/audio/xmms-jack/Makefile @@ -22,12 +22,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gtk12 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= lib/xmms/Output/libjackout.so -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile index 36e5f302449a..8e43c8b5a337 100644 --- a/audio/xmms-mad/Makefile +++ b/audio/xmms-mad/Makefile @@ -21,12 +21,11 @@ USE_BZIP2= yes USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= lib/xmms/Input/libxmmsmad.so -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib do-install: cd ${WRKSRC}/src/.libs \ diff --git a/audio/xmms-mp3cue/Makefile b/audio/xmms-mp3cue/Makefile index ebc8a6c88310..5f6fbe2a07f3 100644 --- a/audio/xmms-mp3cue/Makefile +++ b/audio/xmms-mp3cue/Makefile @@ -25,7 +25,7 @@ PLIST_SUB= PORTDOCS=${DISTNAME} .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC" +CFLAGS+= -fPIC .endif post-patch: diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile index 479a2f0d17e0..f7bd43f4c780 100644 --- a/audio/xmms-wavpack/Makefile +++ b/audio/xmms-wavpack/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= wavpack.2:${PORTSDIR}/audio/wavpack \ USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes post-install: diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile index 0c0ea610aa35..7c43c5f8bd92 100644 --- a/audio/xmms-xymms/Makefile +++ b/audio/xmms-xymms/Makefile @@ -23,7 +23,8 @@ USE_GNOME= gtk12 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} PLIST_FILES= lib/xmms/Input/libxymms.a \ lib/xmms/Input/libxymms.la \ diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile index b92d75dbe53c..4eb864028108 100644 --- a/audio/xmms2-scrobbler/Makefile +++ b/audio/xmms2-scrobbler/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 \ curl.6:${PORTSDIR}/ftp/curl USE_GMAKE= yes -MAKE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} PLIST_FILES= bin/xmms2-scrobbler PORTDOCS= README diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile index 2d5c1c8042f1..b0b4dc238125 100644 --- a/audio/xsynth-dssi/Makefile +++ b/audio/xsynth-dssi/Makefile @@ -25,9 +25,8 @@ LICENSE_COMB= multi USE_GNOME= gtk20 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index 95dcb4b8df65..0f8f149bf8b9 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -19,8 +19,8 @@ COMMENT= Yet Another Mp3 Tool which helps you to organize your mp3s USE_GMAKE= yes USE_GNOME= gnomelibs gnomehack gnomeprefix GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile index 6e1f98b89993..6b57c0405e30 100644 --- a/audio/zinf/Makefile +++ b/audio/zinf/Makefile @@ -24,11 +24,10 @@ USE_PERL5= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-ipv6 -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> |