diff options
Diffstat (limited to 'multimedia')
78 files changed, 148 insertions, 164 deletions
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile index 041259eb5e76..6b2366af630d 100644 --- a/multimedia/aegisub/Makefile +++ b/multimedia/aegisub/Makefile @@ -50,8 +50,6 @@ CFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/wx-2.8 \ -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" INSTALLS_ICONS= yes diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index 2f230acbe538..f1715a5729cb 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -19,9 +19,8 @@ BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ - CFLAGS="-I${LOCALBASE}/include" \ - CPP=${CPP} +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --disable-evdevplug --disable-alsa \ --disable-pulse --disable-projectm-1.0 WANT_GNOME= yes diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile index c237f57023db..6fda908ac325 100644 --- a/multimedia/audacious/Makefile +++ b/multimedia/audacious/Makefile @@ -19,8 +19,8 @@ USE_GMAKE= yes USE_XORG= x11 sm USE_GNOME= gtk20 libglade2 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= audacious.1 audtool.1 diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile index 436218cb39f5..a4faa8a90d55 100644 --- a/multimedia/audiopreview/Makefile +++ b/multimedia/audiopreview/Makefile @@ -17,8 +17,8 @@ USE_GMAKE= yes USE_GSTREAMER= core USE_GNOME= intltool GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include PLIST_FILES= bin/audiopreview MAN1= audiopreview.1 diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 28f761e96d99..329ba21aa711 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -27,9 +27,9 @@ USE_ICONV= yes USE_LDCONFIG= yes LIBTOOLFILES= configure ffmpeg/configure -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \ --disable-v4l \ --disable-divx4 diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index 405359dc7da1..c5fbef9af8ba 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -23,11 +23,11 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lstdc++" \ - INPUT_PLUGINS="${INPUT_PLUGINS}" \ +CONFIGURE_ENV= INPUT_PLUGINS="${INPUT_PLUGINS}" \ OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \ VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lstdc++ MAN1= beep-media-player.1 INPUT_PLUGINS= cdaudio,mpg123,wav diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile index 2a3e5530a31e..d5b4f1dcfebf 100644 --- a/multimedia/bmp-extra-plugins/Makefile +++ b/multimedia/bmp-extra-plugins/Makefile @@ -25,8 +25,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} \ --with-vorbis=${LOCALBASE} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g ; \ diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index 1dfc34943ba0..f49d2f63ca91 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -24,11 +24,11 @@ ONLY_FOR_ARCHS= i386 alpha USE_AUTOTOOLS= autoconf libtool libltdl USE_EFL= imlib2 -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ +CPPFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/gtk12 \ -I${LOCALBASE}/include/gdk-pixbuf-1.0 \ - -I${LOCALBASE}/include/glib12" \ - LDFLAGS="-L${LOCALBASE}/lib" + -I${LOCALBASE}/include/glib12 +LDFLAGS+= -L${LOCALBASE}/lib .if exists(/usr/include/dev/bktr/ioctl_bt848.h) post-patch: diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index 779ce3184c50..56c506443749 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -31,8 +31,8 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib DOCS= AUTHORS COPYING ChangeLog NEWS README GCONF_SCHEMAS= cheese.schemas diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile index e09283b10f9d..3b915db3c849 100644 --- a/multimedia/clutter-gst/Makefile +++ b/multimedia/clutter-gst/Makefile @@ -22,7 +22,6 @@ USE_GNOME= gnomehack ltverhack gnomeprefix USE_GSTREAMER= yes USE_XORG= xp x11 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile index fb44046829b4..8f9dab5d6366 100644 --- a/multimedia/dirac/Makefile +++ b/multimedia/dirac/Makefile @@ -21,8 +21,8 @@ MAKE_JOBS_SAFE= yes USE_GNOME= pkgconfig gnomehack USE_LDCONFIG= yes -CONFIGURE_ENV?= CPPFLAGS=-I${LOCALBASE}/include \ - HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \ +CONFIGURE_ENV?= HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \ HAVE_DOXYGEN=${FALSE} HAVE_DOT=${FALSE} +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/multimedia/dvbsnoop/Makefile b/multimedia/dvbsnoop/Makefile index cef7d66d2a4c..8a04e39db4d2 100644 --- a/multimedia/dvbsnoop/Makefile +++ b/multimedia/dvbsnoop/Makefile @@ -16,7 +16,7 @@ COMMENT= DVB stream analyzer / MPEG analyzer DVB_HEADERS= dmx.h frontend.h GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${WRKSRC}" +CFLAGS+= -I${WRKSRC} USE_GMAKE= yes PLIST_FILES= bin/${PORTNAME} diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile index 687c2c071c75..cb26614dc0f5 100644 --- a/multimedia/dvdauthor/Makefile +++ b/multimedia/dvdauthor/Makefile @@ -22,7 +22,7 @@ USE_BISON= build USE_GMAKE= yes GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/dvdauthor MAN1= dvdauthor.1 dvddirdel.1 dvdunauthor.1 mpeg2desc.1 spumux.1 spuunmux.1 @@ -40,7 +40,7 @@ WITH_IMAGEMAGICK= yes .if defined(WITH_ICONV) USE_ICONV= yes -CFLAGS+= "-DICONV_CONV=yes" +CFLAGS+= -DICONV_CONV=yes .endif .if defined(WITH_IMAGEMAGICK) LIB_DEPENDS+= MagickWand.4:${PORTSDIR}/graphics/ImageMagick diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 2982b6970f33..fc849b087371 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -41,7 +41,7 @@ USE_GETTEXT= yes USE_CDRTOOLS= yes # dvdstyler needs mkisofs GNU_CONFIGURE= yes CPPFLAGS+= "-I${LOCALBASE}/include" -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAN1= dvdstyler.1 .include <bsd.port.pre.mk> diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 06523dd30359..a4f61e461317 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ swscale:${PORTSDIR}/multimedia/ffmpeg \ jpeg.11:${PORTSDIR}/graphics/jpeg -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig GNU_CONFIGURE= yes diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile index ebd501db6fb8..d1ee2157ddc8 100644 --- a/multimedia/gavl/Makefile +++ b/multimedia/gavl/Makefile @@ -23,8 +23,8 @@ USE_GNOME= pkgconfig gnomehack USE_LDCONFIG= yes MAKE_JOBS_SAFE= 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-cpuflags --without-doxygen PORTDOCS= README diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index 27bafe048938..ee664bcc13a6 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -19,8 +19,8 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libgnomeui diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile index 802ec656f5e0..4c47ef7e4276 100644 --- a/multimedia/gmerlin-avdecoder/Makefile +++ b/multimedia/gmerlin-avdecoder/Makefile @@ -42,12 +42,11 @@ OPTIONS= GMERLIN "Enable gmerlin support" on \ USE_GNOME= gnomehack pkgconfig USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --without-cpuflags --without-doxygen USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile index 038ddc91d697..a23ffa98501c 100644 --- a/multimedia/gmerlin/Makefile +++ b/multimedia/gmerlin/Makefile @@ -40,15 +40,14 @@ USE_XORG= ice x11 xinerama xv USE_GL= gl USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-alsa --disable-v4l --disable-v4l2 \ --disable-camelot --disable-alsamixer --disable-v4lconvert \ --without-doxygen --without-cpuflags USE_LDCONFIG= yes INSTALL_ICONS= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INFO= gmerlin MAN1= gmerlin_play.1 diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile index 58c5b639076f..4b9a9b277e3f 100644 --- a/multimedia/gnome-mplayer/Makefile +++ b/multimedia/gnome-mplayer/Makefile @@ -31,8 +31,8 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GNOME= glib20 gtk20 INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --without-alsa MAN1= ${PORTNAME}.1 diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile index d1038b05003c..96a10ec12b79 100644 --- a/multimedia/gnome-subtitles/Makefile +++ b/multimedia/gnome-subtitles/Makefile @@ -24,8 +24,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gtksharp20 gnomesharp20 gnomedocutils USE_GSTREAMER= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gnome-subtitles.schemas INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile index 9930b08c6a0f..e2da83e61dda 100644 --- a/multimedia/gopchop/Makefile +++ b/multimedia/gopchop/Makefile @@ -22,11 +22,10 @@ LIB_DEPENDS= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 USE_GNOME= gtk12 intlhack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-sdl -CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/multimedia/gst123/Makefile b/multimedia/gst123/Makefile index 7ef9de2d101f..73d9bcfe7b38 100644 --- a/multimedia/gst123/Makefile +++ b/multimedia/gst123/Makefile @@ -20,7 +20,8 @@ USE_GMAKE= yes USE_BZIP2= yes USE_GNOME= gtk20 USE_GSTREAMER= good -CONFIGURE_ENV= NCURSES5_CONFIG=/usr/bin/true LDFLAGS=-lncurses +CONFIGURE_ENV= NCURSES5_CONFIG=/usr/bin/true +LDFLAGS+= -lncurses PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index ac0e488c3fae..4dc1b30dde08 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -26,9 +26,10 @@ USE_LDCONFIG= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--with-ffmpeg-extra-configure=--cc=${CC}" -CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ - CFLAGS="${CFLAGS} -fno-force-addr" \ - LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic" +CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} + +LDFLAGS+= -Wl,-Bsymbolic +CFLAGS+= -fno-force-addr PLIST_SUB= \ VERSION="${GST_VERSION}" WITHOUT_CPU_CFLAGS= yes diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 7d82d2a579b6..e59aab49f5c6 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -53,9 +53,9 @@ USE_AUTOTOOLS= libtool GST_PLUGIN?= base CONFIGURE_ARGS= --disable-option-checking -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index d1dfb327b5d6..dd46e968fd39 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -34,11 +34,8 @@ PLIST_SUB= VERSION="${GST_VERSION}" GST_VERSION=${PORTVERSION:C/..$//} -CMAKE_ARGS+= \ - -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \ - -DCMAKE_MODULE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" +CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" +LDFLAGS+= -L${LOCALBASE}/lib post-extract: ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 1d2a0b559d6f..dcac257de455 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -32,9 +32,9 @@ CONFIGURE_ARGS= --disable-tests \ --disable-examples \ --disable-failing-tests \ --disable-gtk-doc -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - ac_cv_func_register_printf_function="no" \ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= ac_cv_func_register_printf_function="no" \ FLEX_PATH="${LOCALBASE}/bin/flex" PLIST_SUB= VERSION="${GST_VERSION}" USE_LDCONFIG= yes diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile index 0fb4fdbafbb1..9e0c58573682 100644 --- a/multimedia/gtk-recordmydesktop/Makefile +++ b/multimedia/gtk-recordmydesktop/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/recordmydesktop:${PORTSDIR}/multimedia/recordmydes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_PYTHON= yes USE_GNOME= gtk20 pygtk2 desktopfileutils INSTALL_ICONS= yes diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile index c7f118f84a4f..f6acb257acb0 100644 --- a/multimedia/gxmms/Makefile +++ b/multimedia/gxmms/Makefile @@ -22,8 +22,8 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="`pkg-config --libs libgnomeui-2.0`" +CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" +CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile index 2d412c7550aa..009a51900fb7 100644 --- a/multimedia/kaffeine-mozilla/Makefile +++ b/multimedia/kaffeine-mozilla/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_WEBPLUGINS= native WEBPLUGINS_FILES=kaffeineplugin.so GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include USE_AUTOTOOLS= libtool .include <bsd.port.pre.mk> diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index efaf2e039916..ee0c5d724706 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -30,11 +30,11 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libglade2 libxml2 USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt \ - -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib/libquicktime \ - -L${LOCALBASE}/lib" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include/lqt \ + -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/libquicktime \ + -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-dv1394 MAN1= kino.1 kino2raw.1 diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index 9b2165a965e0..6edff8440806 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -28,7 +28,7 @@ MAN1= kissdx.1 USE_RC_SUBR= kissdx # set enviroment variables for port makefile -MAKE_ENV= FreeBSD=defined LDFLAGS="${LDFLAGS}" +MAKE_ENV= FreeBSD=defined # Convert CR/LF to LF in source files USE_DOS2UNIX= yes diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index d0077accc6e5..1c1e62598263 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -21,9 +21,9 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gtk -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig +CONFIGURE_ENV= PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_LDCONFIG= yes MAN1= dubdv.1 dvconnect.1 encodedv.1 @@ -39,7 +39,7 @@ OPTIONS+= SDL "Add SDL support" off # Optimizations -O{1,s,2,3} work # However, lack of -O{1,s,2,3} or -O0 BREAK the build # Therefore, make sure we have AT LEAST -O and avoid -O0 -CONFIGURE_ENV+= CFLAGS="-O ${CFLAGS:N-O0}" +CFLAGS:= -O ${CFLAGS:N-O0} .if defined(WITH_SDL) USE_SDL= sdl diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile index e568eda039a4..bf222b0656fa 100644 --- a/multimedia/libdvdplay/Makefile +++ b/multimedia/libdvdplay/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-dvdread-tree=${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes .include <bsd.port.mk> diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile index f38f4016d3bb..c270ffa6f2cf 100644 --- a/multimedia/libmpeg3/Makefile +++ b/multimedia/libmpeg3/Makefile @@ -33,8 +33,8 @@ BIN_FILES= mpeg3cat mpeg3dump mpeg3peek mpeg3toc INC_FILES= libmpeg3.h mpeg3private.h mpeg3protos.h LIB_FILES= libmpeg3.a -CPPFLAGS= -I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS} -LDFLAGS= -lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS} +CPPFLAGS+= -I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS} +LDFLAGS+= -lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS} NASM?= ${LOCALBASE}/bin/nasm diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 5bda57804482..0ff585c9129c 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -28,8 +28,8 @@ USE_GETTEXT= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= autoconf -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl CFLAGS+= -fPIC .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS) diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index e09d52540247..0c44633450ff 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -22,9 +22,9 @@ USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool USE_GNOME= ltverhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="${PTHEAD_LIBS}" +CONFIGURE_ENV= LIBS="${PTHEAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-sdltest \ --enable-shared \ --disable-examples diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index f2ba5878dccb..b6d738ecd97d 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -25,7 +25,6 @@ USE_GL= gl USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize ACLOCAL_ARGS= -I. AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --program-prefix=va USE_LDCONFIG= yes diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index ec36720bac03..3211c2d9242b 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -51,12 +51,12 @@ USE_GL= gl glu USE_PERL5_BUILD=yes USE_SDL= sdl USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg" \ - CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" \ EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \ --enable-ipv6 \ --with-external-libmad \ diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index 81d95875cde1..dd27151ffbf0 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -53,11 +53,10 @@ USE_GHOSTSCRIPT_RUN= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-ldvgrab -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \ OMC/lives-OMC.txt \ diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile index b5491b9253df..39d4c199ee89 100644 --- a/multimedia/lsdvd/Makefile +++ b/multimedia/lsdvd/Makefile @@ -17,7 +17,8 @@ COMMENT= Print information about the contents and structure of a DVD LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= lsdvd.1 PLIST_FILES= bin/lsdvd diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile index c62ee70954b3..82eba65c57c2 100644 --- a/multimedia/lxdvdrip/Makefile +++ b/multimedia/lxdvdrip/Makefile @@ -44,7 +44,6 @@ LXDVDRIPSRC= cputest.c \ vaporize.c CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm -MAKE_ENV+= LDFLAGS="${LDFLAGS}" PORTDOCS= Changelog.de Changelog.en Changelog.fr \ README.de README.en README.fr \ diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile index d0d9c694adbb..3cac9fb301ba 100644 --- a/multimedia/miro/Makefile +++ b/multimedia/miro/Makefile @@ -46,7 +46,7 @@ INSTALLS_EGGINFO= yes MANCOMPRESSED= yes MAN1= miro.1 miro.real.1 -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} .include <bsd.port.pre.mk> diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index b1e1f0ed42f7..07adb796a520 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -30,8 +30,7 @@ WANT_GNOME= yes WANT_SDL= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no CONFIGURE_ARGS= --without-x @@ -50,8 +49,8 @@ DOC_FILES= AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README \ README.DV README.avilib README.glav README.AltiVec \ README.lavpipe README.transist TODO -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/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 065ccd4ba690..a00d946c2742 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -32,8 +32,7 @@ USE_RAKE= yes USE_RUBY= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - ac_cv_path_PO4A=no +CONFIGURE_ENV+= ac_cv_path_PO4A=no CONFIGURE_ARGS= --enable-lzo --enable-bz2 --disable-qt \ --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile index b542f2dd3a63..9cd5b346d279 100644 --- a/multimedia/moonlight/Makefile +++ b/multimedia/moonlight/Makefile @@ -29,8 +29,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomedesktopsharp20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-cairo=system \ --with-debug=yes \ --with-ff2=no \ diff --git a/multimedia/mp4split/Makefile b/multimedia/mp4split/Makefile index e1eb273a54fa..6b49f0a75439 100644 --- a/multimedia/mp4split/Makefile +++ b/multimedia/mp4split/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-expat -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/mp4split diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 01750fe4fb76..e449541ce919 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -36,8 +36,8 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ --disable-static diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile index 497fe84d2e4e..8ed63802588a 100644 --- a/multimedia/mythtv-frontend/Makefile +++ b/multimedia/mythtv-frontend/Makefile @@ -42,7 +42,8 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" \ CPPFLAGS+= ${QTCPPFLAGS} CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ - QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib" + QTDIR="${QT_PREFIX}" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-audio-alsa --disable-firewire --disable-iptv \ --disable-hdhomerun \ diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index ed8ff2d20ccf..d504fd5b099b 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -48,7 +48,8 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" \ CPPFLAGS+= ${QTCPPFLAGS} CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ - QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib" + QTDIR="${QT_PREFIX}" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --prefix=${PREFIX} --dvb-path=${LOCALBASE}/include \ --extra-cflags=-g --extra-cxxflags=-g --enable-v4l \ diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile index 2be767ee29af..704ef965cf57 100644 --- a/multimedia/oggvideotools/Makefile +++ b/multimedia/oggvideotools/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include MAKEFILE= makefile .for app in oggSplit oggDump oggJoin oggCut oggCat oggLength oggSlideshow oggThumb oggResize oggSilence oggScroll mkThumbs mkSlideshow diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile index ad3b4af9a107..4b442d93c12f 100644 --- a/multimedia/ogmrip/Makefile +++ b/multimedia/ogmrip/Makefile @@ -40,13 +40,12 @@ USE_GNOME= glib20 gnomehack intlhack libxml2 USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes MAN1= dvdcpy.1 avibox.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/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index e172e29788bf..c3ed61dad4b0 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -24,8 +24,8 @@ USE_GSTREAMER= gnonlin python good USE_PYTHON= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBAES}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBAES}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var USE_LDCONFIG= yes diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index 1570755b491a..6af9c48fb3c5 100644 --- a/multimedia/py-gstreamer/Makefile +++ b/multimedia/py-gstreamer/Makefile @@ -28,8 +28,8 @@ USE_GNOME= pygobject gnomehack pkgconfig USE_GSTREAMER= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${GST_VERSION}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE} ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE} ${PTHREAD_LIBS} post-patch: @${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile index 55c56bf03fc1..8143b9bcde80 100644 --- a/multimedia/py-kaa-metadata/Makefile +++ b/multimedia/py-kaa-metadata/Makefile @@ -24,6 +24,5 @@ USE_PYDISTUTILS= yes CFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib -MAKE_ENV+= LDFLAGS="${LDFLAGS}" # ${CFLAGS} is already there .include <bsd.port.mk> diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile index cd53c784586e..d44963f00f83 100644 --- a/multimedia/quark/Makefile +++ b/multimedia/quark/Makefile @@ -21,8 +21,8 @@ USE_GNOME= gnomehack gnomeprefix gnomevfs2 USE_GETTEXT= yes USE_GMAKE= 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 diff --git a/multimedia/recmpeg/Makefile b/multimedia/recmpeg/Makefile index ebd153af4547..740403b4d524 100644 --- a/multimedia/recmpeg/Makefile +++ b/multimedia/recmpeg/Makefile @@ -18,13 +18,12 @@ COMMENT= A simple video encoder LIB_DEPENDS= fame-0.9.1:${PORTSDIR}/multimedia/libfame GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= recmpeg.1 PLIST_FILES= bin/recmpeg -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile index 1ca48998ba38..989778f956e4 100644 --- a/multimedia/rtmpdump/Makefile +++ b/multimedia/rtmpdump/Makefile @@ -21,7 +21,8 @@ MAN8= rtmpgw.8 USE_GNOME= pkgconfig USE_LDCONFIG= yes USE_OPENSSL= yes -MAKE_ENV= CFLAGS="${PTHREAD_CFLAGS}" THREADLIB="${PTHREAD_LIBS}" +MAKE_ENV= THREADLIB="${PTHREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} PORTDOCS= ChangeLog README .include <bsd.port.pre.mk> diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile index 8713693fc03e..e2f4e7555e11 100644 --- a/multimedia/sabbu/Makefile +++ b/multimedia/sabbu/Makefile @@ -26,7 +26,6 @@ GNU_CONFIGURE= yes USE_GNOME= gtk20 CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lswscale -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index b11e6a2d48ea..ce813f359938 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -23,8 +23,8 @@ GNU_CONFIGURE= yes USE_SDL= sdl USE_LDCONFIG= yes CONFIGURE_ENV= GLBASE="${LOCALBASE}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ CC="${CXX}" REAL_CC="${CC}" +CPPFLAGS+= -I${LOCALBASE}/include #If you want to try the opengl player (which doesn't seem to work) #comment out the following line. diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile index d5260805ee7a..d6a897158953 100644 --- a/multimedia/spook/Makefile +++ b/multimedia/spook/Makefile @@ -33,7 +33,8 @@ NOMAN= defined SUB_FILES= pkg-message -CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile index 71107464bb16..f61403e026de 100644 --- a/multimedia/subtitleeditor/Makefile +++ b/multimedia/subtitleeditor/Makefile @@ -28,9 +28,8 @@ USE_GSTREAMER= good USE_GETTEXT= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}" MAN1= subtitleeditor.1 diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile index 4a90ef90f0c0..5d310df581e6 100644 --- a/multimedia/swfdec-gnome/Makefile +++ b/multimedia/swfdec-gnome/Makefile @@ -23,8 +23,8 @@ INSTALLS_ICONS= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= swfdec-thumbnailer.schemas diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index 49eae52880d6..fa13547cd6a1 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -26,7 +26,7 @@ USE_GNOME= gnomehack gnomeprefix glib20 libxml2 intlhack ltverhack USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 3020a8a92f4e..b13a5ed0e8ff 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -38,9 +38,9 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes INSTALLS_OMF= yes PKGMESSAGE= ${WRKDIR}/pkg-message -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lXrandr" \ +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lXrandr" \ BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}" +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}" MAN1= totem.1 totem-video-thumbnailer.1 diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 17b5a3ece2ba..98cc3eea68e6 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -28,8 +28,8 @@ WANT_SDL= yes WANT_GNOME= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -isystem ${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - SDL_CONFIG="${SDL_CONFIG}" +CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-libmpeg2-prefix=${LOCALBASE} \ --with-libavcodec-prefix=${LOCALBASE} \ --enable-oss diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile index d9cbfcd9dcec..1c93a37cdc4d 100644 --- a/multimedia/vamps/Makefile +++ b/multimedia/vamps/Makefile @@ -17,7 +17,6 @@ COMMENT= High performance tool to transcode DVD videos to a smaller size LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread USE_GMAKE= yes -MAKE_ENV= LDFLAGS="${LDFLAGS}" MAKE_JOBS_SAFE= yes CFLAGS+= -DHAVE_BUILTIN_EXPECT \ diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile index ee9c449ba6a6..4cdb51487ad4 100644 --- a/multimedia/vcdimager/Makefile +++ b/multimedia/vcdimager/Makefile @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig lthack -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= cdxa2mpeg.1 vcdimager.1 vcdxminfo.1 vcdxrip.1 vcdxgen.1 \ vcdxbuild.1 vcd-info.1 diff --git a/multimedia/vdpau-video/Makefile b/multimedia/vdpau-video/Makefile index de12ba705c66..a471b95020b4 100644 --- a/multimedia/vdpau-video/Makefile +++ b/multimedia/vdpau-video/Makefile @@ -26,7 +26,6 @@ USE_GL= gl GNU_CONFIGURE= yes CPPFLAGS+= -isystem${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 85bb802ce561..1ddb320b5e3b 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -109,8 +109,9 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${FAKEDIR}/include -I${WRKSRC}/include \ -I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg \ ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib \ - -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" LIBS="-lc" +CONFIGURE_ENV= LIBS="-lc" +LDFLAGS+= -L${FAKEDIR}/lib \ + -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc CONFIGURE_ARGS+= --enable-vlc \ --enable-avcodec \ diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile index a8d65222d402..f66830329218 100644 --- a/multimedia/w_scan/Makefile +++ b/multimedia/w_scan/Makefile @@ -25,7 +25,6 @@ PORTDOCS= COPYING ChangeLog README PLIST_FILES= bin/${PORTNAME} MAN1= w_scan.1 MAKE_JOBS_SAFE= yes -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" post-patch: ${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/configure ${WRKSRC}/*.c ${WRKSRC}/*.h diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index cb37b88517f1..7c2e4a347e89 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -32,8 +32,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5= yes USE_XORG= x11 xaw -CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ - CFLAGS="-I${WRKSRC}/common" +CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" +CFLAGS+= -I${WRKSRC}/common MAKE_ENV= verbose=yes USE_LDCONFIG= yes ONLY_FOR_ARCHS= alpha amd64 i386 diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index 268191ced71d..2430b7fc2ad4 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -99,8 +99,8 @@ DESKTOP_ENTRIES="XBMC" \ "AudioVideo;Video;" \ true -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-external-libraries diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile index 4458a4a599aa..ebf679464257 100644 --- a/multimedia/xfce4-parole/Makefile +++ b/multimedia/xfce4-parole/Makefile @@ -35,9 +35,9 @@ CONFIGURE_ARGS= --disable-power-manager-plugin \ --enable-taglib \ --disable-gtk-doc-html \ --without-html-dir -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - ac_cv_prog_AWK="${AWK}" +CONFIGURE_ENV= ac_cv_prog_AWK="${AWK}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig \ desktopfileutils USE_XFCE= configenv libgui libutil diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index 0c6126cafb27..21aafd273363 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -27,10 +27,10 @@ USE_GMAKE= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-vdr-keys -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes MANLANG= "" de es fr pl diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile index 13a18407f944..c5f47f628499 100644 --- a/multimedia/xmms-status-plugin/Makefile +++ b/multimedia/xmms-status-plugin/Makefile @@ -19,8 +19,8 @@ USE_XORG= x11 xpm USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: ${REINPLACE_CMD} -e 's,-Werror,,' ${WRKSRC}/configure diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index 46ddde42b370..839a3b06b4c7 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -26,12 +26,12 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= automake autoconf libtool AUTOTOOLSFILES= aclocal.m4 AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ INPUT_PLUGINS="${INPUT_PLUGINS}" \ OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \ VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --enable-static=no MAN1= wmxmms.1 xmms.1 SUB_FILES= pkg-message xmms.desktop diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 926c1e80d5cf..a2c12431568e 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -26,11 +26,10 @@ USE_GNOME= gtk12 USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gl -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: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ |