aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2011-09-23 22:26:39 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2011-09-23 22:26:39 +0000
commit6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch)
tree3b556699991305af672fba96e0e8b6bb88bcc7da /graphics
parent86f8cde1da39aadc3efbc11e60998d886c86c36e (diff)
downloadports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz
ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/EZWGL/Makefile4
-rw-r--r--graphics/GraphicsMagick/Makefile4
-rw-r--r--graphics/GraphicsMagick12/Makefile7
-rw-r--r--graphics/GraphicsMagick13/Makefile7
-rw-r--r--graphics/ImageMagick/Makefile5
-rw-r--r--graphics/OpenEXR/Makefile2
-rw-r--r--graphics/aaphoto/Makefile4
-rw-r--r--graphics/agave/Makefile3
-rw-r--r--graphics/ale/Makefile5
-rw-r--r--graphics/alpng/Makefile1
-rw-r--r--graphics/animorph/Makefile4
-rw-r--r--graphics/apngasm/Makefile2
-rw-r--r--graphics/autotrace/Makefile6
-rw-r--r--graphics/bugle/Makefile4
-rw-r--r--graphics/cairo-java/Makefile2
-rw-r--r--graphics/cairo/Makefile2
-rw-r--r--graphics/cairomm/Makefile6
-rw-r--r--graphics/cbrpager/Makefile4
-rw-r--r--graphics/cegui/Makefile6
-rw-r--r--graphics/chbg/Makefile4
-rw-r--r--graphics/cimg/Makefile6
-rw-r--r--graphics/cinepaint/Makefile2
-rw-r--r--graphics/clutter-box2d/Makefile1
-rw-r--r--graphics/clutter-gtk/Makefile1
-rw-r--r--graphics/clutter-qt/Makefile1
-rw-r--r--graphics/clutter/Makefile1
-rw-r--r--graphics/corona/Makefile4
-rw-r--r--graphics/danpei/Makefile3
-rw-r--r--graphics/devil/Makefile5
-rw-r--r--graphics/dia/Makefile4
-rw-r--r--graphics/diacanvas2/Makefile4
-rw-r--r--graphics/divxcalc/Makefile4
-rw-r--r--graphics/djview4/Makefile8
-rw-r--r--graphics/dynamechs/Makefile4
-rw-r--r--graphics/electriceyes/Makefile4
-rw-r--r--graphics/enblend/Makefile4
-rw-r--r--graphics/enfle/Makefile7
-rw-r--r--graphics/eog-plugins/Makefile4
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/epdfview/Makefile5
-rw-r--r--graphics/epeg/Makefile4
-rw-r--r--graphics/evince/Makefile4
-rw-r--r--graphics/exiv2/Makefile2
-rw-r--r--graphics/exrtools/Makefile2
-rw-r--r--graphics/f-spot/Makefile4
-rw-r--r--graphics/feh/Makefile1
-rw-r--r--graphics/flashplayer/Makefile4
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/fotoxx/Makefile2
-rw-r--r--graphics/freeglut/Makefile3
-rw-r--r--graphics/frontline/Makefile4
-rw-r--r--graphics/fyre/Makefile1
-rw-r--r--graphics/g2/Makefile2
-rw-r--r--graphics/gcolor/Makefile4
-rw-r--r--graphics/gcolor2/Makefile4
-rw-r--r--graphics/gd/Makefile2
-rw-r--r--graphics/gdk-pixbuf/Makefile4
-rw-r--r--graphics/gdk-pixbuf2/Makefile4
-rw-r--r--graphics/geeqie/Makefile3
-rw-r--r--graphics/gegl/Makefile4
-rw-r--r--graphics/gif2png/Makefile1
-rw-r--r--graphics/giflib/Makefile1
-rw-r--r--graphics/gimageview/Makefile4
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/gimp-focusblur-plugin/Makefile4
-rw-r--r--graphics/gimp-gap/Makefile4
-rw-r--r--graphics/gimp-gmic-plugin/Makefile4
-rw-r--r--graphics/gimp-lqr-plugin/Makefile4
-rw-r--r--graphics/gimpshop/Makefile4
-rw-r--r--graphics/giram/Makefile6
-rw-r--r--graphics/glitz/Makefile4
-rw-r--r--graphics/gliv/Makefile5
-rw-r--r--graphics/gltt/Makefile4
-rw-r--r--graphics/gnomeiconedit/Makefile4
-rw-r--r--graphics/goom/Makefile4
-rw-r--r--graphics/gphoto2/Makefile5
-rw-r--r--graphics/gqview-devel/Makefile4
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/graphviz/Makefile5
-rw-r--r--graphics/grx/Makefile4
-rw-r--r--graphics/gscan2pdf/Makefile1
-rw-r--r--graphics/gstreamer-plugins-gl/Makefile4
-rw-r--r--graphics/gthumb/Makefile4
-rw-r--r--graphics/gtk-update-icon-cache/Makefile6
-rw-r--r--graphics/gtkam/Makefile4
-rw-r--r--graphics/gtkdps/Makefile4
-rw-r--r--graphics/gtkgraph/Makefile4
-rw-r--r--graphics/gtksee/Makefile4
-rw-r--r--graphics/gts/Makefile5
-rw-r--r--graphics/icon-slicer/Makefile3
-rw-r--r--graphics/icoutils/Makefile5
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/iulib/Makefile3
-rw-r--r--graphics/jasper/Makefile4
-rw-r--r--graphics/jpeginfo/Makefile4
-rw-r--r--graphics/jpegpixi/Makefile4
-rw-r--r--graphics/k3d/Makefile4
-rw-r--r--graphics/kdc2tiff/Makefile4
-rw-r--r--graphics/kludge3d/Makefile5
-rw-r--r--graphics/kudu/Makefile4
-rw-r--r--graphics/lcms-python/Makefile2
-rw-r--r--graphics/lcms/Makefile6
-rw-r--r--graphics/lcms2/Makefile6
-rw-r--r--graphics/lensfun/Makefile1
-rw-r--r--graphics/leptonica/Makefile3
-rw-r--r--graphics/lib3ds/Makefile5
-rw-r--r--graphics/libGL/bsd.mesalib.mk4
-rw-r--r--graphics/libafterimage/Makefile5
-rw-r--r--graphics/libchamplain/Makefile4
-rw-r--r--graphics/libexif-gtk/Makefile4
-rw-r--r--graphics/libexif/Makefile4
-rw-r--r--graphics/libflash/Makefile4
-rw-r--r--graphics/libgfx/Makefile5
-rw-r--r--graphics/libggi/Makefile3
-rw-r--r--graphics/libggigcp/Makefile3
-rw-r--r--graphics/libggimisc/Makefile3
-rw-r--r--graphics/libggiwmh/Makefile3
-rw-r--r--graphics/libgltext/Makefile1
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libopenraw/Makefile3
-rw-r--r--graphics/libpano12/Makefile8
-rw-r--r--graphics/libpano13/Makefile8
-rw-r--r--graphics/libqrencode/Makefile2
-rw-r--r--graphics/librsvg/Makefile4
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--graphics/libvisual/Makefile4
-rw-r--r--graphics/libvisual04-plugins/Makefile4
-rw-r--r--graphics/libvisual04/Makefile5
-rw-r--r--graphics/makehuman/Makefile4
-rw-r--r--graphics/megapov/Makefile1
-rw-r--r--graphics/mesa-demos/Makefile4
-rw-r--r--graphics/meshviewer/Makefile4
-rw-r--r--graphics/metacam/Makefile1
-rw-r--r--graphics/metapixel/Makefile1
-rw-r--r--graphics/mhgui/Makefile4
-rw-r--r--graphics/ming/Makefile5
-rw-r--r--graphics/morpheus/Makefile4
-rw-r--r--graphics/multican/Makefile2
-rw-r--r--graphics/ocaml-images/Makefile4
-rw-r--r--graphics/ocropus/Makefile3
-rw-r--r--graphics/opencv/Makefile2
-rw-r--r--graphics/opendx/Makefile6
-rw-r--r--graphics/panoglview/Makefile8
-rw-r--r--graphics/passepartout/Makefile4
-rw-r--r--graphics/pecl-qrencode/Makefile4
-rw-r--r--graphics/pfscalibration/Makefile4
-rw-r--r--graphics/pfstmo/Makefile4
-rw-r--r--graphics/pfstools/Makefile6
-rw-r--r--graphics/php-facedetect/Makefile1
-rw-r--r--graphics/pixie/Makefile5
-rw-r--r--graphics/plotutils/Makefile1
-rw-r--r--graphics/pngnq/Makefile3
-rw-r--r--graphics/poppler/Makefile6
-rw-r--r--graphics/pornview/Makefile4
-rw-r--r--graphics/ppminfo/Makefile3
-rw-r--r--graphics/pqiv/Makefile4
-rw-r--r--graphics/pstoedit/Makefile5
-rw-r--r--graphics/py-cairo/Makefile4
-rw-r--r--graphics/py-clutter-gtk/Makefile1
-rw-r--r--graphics/py-clutter/Makefile1
-rw-r--r--graphics/py-glewpy/Makefile1
-rw-r--r--graphics/py-paint/Makefile2
-rw-r--r--graphics/py-visual/Makefile2
-rw-r--r--graphics/qslim/Makefile7
-rw-r--r--graphics/quat-gui/Makefile4
-rw-r--r--graphics/quesoglc/Makefile3
-rw-r--r--graphics/rawstudio/Makefile4
-rw-r--r--graphics/reallyslick/Makefile5
-rw-r--r--graphics/ruby-rmagick/Makefile7
-rw-r--r--graphics/sage/Makefile2
-rw-r--r--graphics/sane-backends/Makefile5
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/scale2x/Makefile5
-rw-r--r--graphics/sdl_image/Makefile4
-rw-r--r--graphics/sdl_ttf/Makefile4
-rw-r--r--graphics/seejpeg/Makefile4
-rw-r--r--graphics/simage/Makefile5
-rw-r--r--graphics/sng/Makefile2
-rw-r--r--graphics/sodipodi/Makefile4
-rw-r--r--graphics/sswf/Makefile5
-rw-r--r--graphics/stamp/Makefile5
-rw-r--r--graphics/swfdec/Makefile4
-rw-r--r--graphics/swfmill/Makefile2
-rw-r--r--graphics/swftools/Makefile7
-rw-r--r--graphics/synfigstudio/Makefile4
-rw-r--r--graphics/telak/Makefile1
-rw-r--r--graphics/tgif/Makefile4
-rw-r--r--graphics/tiff2png/Makefile2
-rw-r--r--graphics/tkpng/Makefile3
-rw-r--r--graphics/togl/Makefile4
-rw-r--r--graphics/truevision/Makefile5
-rw-r--r--graphics/ufraw/Makefile5
-rw-r--r--graphics/vp/Makefile1
-rw-r--r--graphics/white_dune/Makefile7
-rw-r--r--graphics/wxsvg/Makefile4
-rw-r--r--graphics/xaos/Makefile8
-rw-r--r--graphics/xmedcon/Makefile4
-rw-r--r--graphics/xmms-blursk/Makefile2
-rw-r--r--graphics/xmms-nebulus/Makefile2
-rw-r--r--graphics/xmms-paranormal/Makefile2
-rw-r--r--graphics/xmorph/Makefile4
-rw-r--r--graphics/xpdf/Makefile4
-rw-r--r--graphics/xsane/Makefile4
-rw-r--r--graphics/zbar/Makefile2
-rw-r--r--graphics/zphoto/Makefile6
207 files changed, 368 insertions, 419 deletions
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index a080819f8db3..09251677ef90 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
USE_XORG= x11 xext
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
NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
.include <bsd.port.pre.mk>
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 5f86da014a3e..82145a91ad1e 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -56,8 +56,8 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
CFLAGS+= -DPNG_DEPSTRUCT=
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
test check:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 988b725faddd..355ac6e6e0a6 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -54,9 +54,8 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
CFLAGS+= -DPNG_DEPSTRUCT=
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${CONFIGURE_LDFLAGS}"
-CONFIGURE_LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
test check:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
@@ -100,7 +99,7 @@ CONFIGURE_ARGS+= --without-dps
IGNORE= does not support OpenMP on FreeBSD version ${OSVERSION}
.endif
-CONFIGURE_LDFLAGS+= ${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-threads --enable-openmp
.else
CONFIGURE_ARGS+= --without-threads --disable-openmp
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 7812114e3655..f820a9da2439 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -55,9 +55,8 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${CONFIGURE_LDFLAGS}"
-CONFIGURE_LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
test check:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
@@ -101,7 +100,7 @@ CONFIGURE_ARGS+= --without-dps
IGNORE= does not support OpenMP on FreeBSD version ${OSVERSION}
.endif
-CONFIGURE_LDFLAGS+= ${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-threads --enable-openmp --disable-openmp-slow
.else
CONFIGURE_ARGS+= --without-threads --disable-openmp
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f40b31400b7e..d133d351c2a0 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -22,7 +22,6 @@ USE_AUTOTOOLS= libltdl
# For some reason, using our libtool breaks the build into pieces:
#USE_AUTOTOOLS+= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shared --without-dps
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
@@ -33,8 +32,8 @@ MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
MagickCore-config.1 MagickWand-config.1 \
identify.1 import.1 mogrify.1 montage.1 stream.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= PORTVERSION=${PORTVERSION:R}
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 04a1135f9eac..7237a609fd2c 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--enable-imfexamples
# must be explicitely linked with -l{thr|pthread}
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
PTHREAD_LIBS+= `${CC} -dumpspecs | ${SED} -ne '/%{\!pg: %{pthread:/s/^.*%{\!pg: %{pthread:\([^}]*\)}.*$$/\1/p' || ${TRUE}`
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index d9598242dfa2..cde5ed737a0b 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -22,8 +22,8 @@ LICENSE= GPLv3
USE_AUTOTOOLS= autoheader
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 84c1f0bfc706..8029678f2a96 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -28,7 +28,8 @@ GCONF_SCHEMAS= agave.schemas
INSTALLS_ICONS= yes
INSTALLS_OMF= 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/graphics/ale/Makefile b/graphics/ale/Makefile
index f34ab7105af3..3a783530d9d9 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -21,14 +21,13 @@ OPTIONS= DOUBLE "64bit Data Precision Support" off \
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-assertions
MAN1= ale.1
PLIST_FILES= bin/ale bin/ale-bin
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# Restrict to stable (even) versions, indicated by the second component.
PORTSCOUT= limitw:1,even
diff --git a/graphics/alpng/Makefile b/graphics/alpng/Makefile
index 1cc64fbe828f..ea2174c6f699 100644
--- a/graphics/alpng/Makefile
+++ b/graphics/alpng/Makefile
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}
MAKEFILE= makefile
USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= CFLAGS="${CFLAGS}"
PLIST_FILES= include/alpng.h \
lib/libalpng.a
diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile
index d033bdf59a75..2e6542c2e9b8 100644
--- a/graphics/animorph/Makefile
+++ b/graphics/animorph/Makefile
@@ -18,8 +18,8 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/graphics/apngasm/Makefile b/graphics/apngasm/Makefile
index 45fbfc402348..ce8d19b72265 100644
--- a/graphics/apngasm/Makefile
+++ b/graphics/apngasm/Makefile
@@ -23,7 +23,7 @@ LICENSE_COMB= dual
ALL_TARGET= ${PORTNAME}
MAKEFILE= /dev/null
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" LDLIBS="${LDLIBS}"
+MAKE_ENV+= LDLIBS="${LDLIBS}"
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
LDLIBS+= -lpng -lm -lz
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index d6a452cd3480..3bbe3be4039b 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming
MAN1= autotrace.1
@@ -32,7 +32,7 @@ OPTIONS= MING "Enable swf interface" off \
.if !defined (WITHOUT_MING)
LIB_DEPENDS+= ming.5:${PORTSDIR}/graphics/ming
-CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming
.endif
.if !defined (WITHOUT_PSTOEDIT)
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index ede06f4f9597..12f9b60c1e03 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -25,9 +25,9 @@ USE_AUTOTOOLS= libltdl
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
CONFIGURE_ARGS=--enable-ltdl-install=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
GL_LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= gldb.1 gldb-gui.1
MAN3= bugle.3
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile
index c1c9e52dab84..b92065c13333 100644
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@@ -28,7 +28,7 @@ JAVA_VERSION= 1.5+
JAVA_OS= native
USE_GNOME= gnomehack
CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
CAIRO_API_VERSION= 1.0
GLIB_API_VERSION= 0.4
PLIST_SUB= CAIRO_API_VERSION=${CAIRO_API_VERSION} PORTNAME=${PORTNAME}
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index a0e59fae355a..cbbf7a9e0dea 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -24,8 +24,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
pixman-1.9:${PORTSDIR}/x11/pixman
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
--enable-tee \
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 8066e701a0c1..f71a7ca6e206 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -23,9 +23,9 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= gnomehack ltverhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
+CONFIGURE_ENV= AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NOPORTDOCS)
CONFIGURE_ARGS+= --disable-documentation
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index 05c797cc2b04..9b363925cd1f 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -19,8 +19,8 @@ LICENSE= GPLv3
USE_GNOME= libgnomeui
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
DESKTOP_ENTRIES= "cbrPager" "Comic book files viewer" "" \
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 830a30210f52..39d5d945ddc6 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -27,9 +27,9 @@ CONFIGURE_ARGS= --disable-toluacegui --disable-irrlicht-renderer \
--disable-libxml --disable-xerces-c --disable-expat --disable-samples
CONFIGURE_ENV+= Lua_LIBS="-L${LUA_LIBDIR} -llua -lm" \
- Lua_CFLAGS="-I${LUA_INCDIR}" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}"
+ Lua_CFLAGS="-I${LUA_INCDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GL= yes
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index a9720ccecf2c..3c6fc5d6ae03 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -19,8 +19,8 @@ USE_GNOME= gdkpixbuf
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --disable-gnome
.include <bsd.port.pre.mk>
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index fa1af1caeab8..796e589919f0 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -32,9 +32,9 @@ LICENSE_COMB= dual
USE_ZIP= yes
WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/}
BUILD_WRKSRC= ${WRKSRC}/examples
-MAKE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
+MAKE_ENV= X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
+CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.if !defined(NOPORTDOCS)
USE_GMAKE= yes
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 340d57e22d94..72fc944122b6 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -52,7 +52,7 @@ PLIST_SUB+= OPENEXR:=""
PLIST_SUB+= OPENEXR:="@comment "
.endif
-CONFIGURE_ENV+= CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= ${CFLAGS}
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index a852f26ed151..6d1684fafdc6 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -22,7 +22,6 @@ USE_GNOME= gnomehack ltverhack gnomeprefix
USE_XORG= xp x11
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-introspection=no
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index 03657899a533..c629bff1d2da 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -24,7 +24,6 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gtk20 ltverhack gnomeprefix
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/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile
index e2a80eeebda7..25b17fa52ba6 100644
--- a/graphics/clutter-qt/Makefile
+++ b/graphics/clutter-qt/Makefile
@@ -25,7 +25,6 @@ USE_QT_VER= 4
QT_COMPONENTS= corelib gui moc_build
USE_GNOME= gnomehack
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 24777e77e333..76c73370e31f 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -28,7 +28,6 @@ USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-x --enable-conformance=no
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index c954a28ee3d7..8558e9badba1 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= lthack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index c8d6e87023c1..8de037908150 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
USE_GETTEXT= yes
USE_GNOME= gtk12 gdkpixbuf
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --without-included-gettext
.include <bsd.port.mk>
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 85d0521a6a7f..b85b769040b5 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -33,14 +33,13 @@ USE_GNOME= pkgconfig
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy --force-missing
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-ILU \
--disable-allegro --disable-directx8 --disable-directx9
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= 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/graphics/dia/Makefile b/graphics/dia/Makefile
index 71cac3999481..a941727bcc25 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -28,9 +28,9 @@ WANT_GNOME= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" \
LOCALBASE="${LOCALBASE}"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= dia.1
MANLANG= "" fr
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 625362334da9..ce84c8471ee2 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gnomehack pygnome2
USE_PYTHON= 2.2+
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
USE_DISPLAY= yes
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index ab1fa03b6082..1164c98b26b4 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -21,8 +21,8 @@ USE_QT_VER= 3
USE_GMAKE= yes
USE_AUTOTOOLS= automake:env autoconf:env
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/divxcalc
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 1d2a29e0d985..07a1f240f80f 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -24,10 +24,10 @@ QT_NONSTANDARD= yes
CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \
--x-libraries="${X11BASE}/lib"
CONFIGURE_ENV= QMAKE="${LOCALBASE}/bin/qmake-qt4" \
- QMAKESPEC="${QMAKESPEC}" \
- CFLAGS="-I${LOCALBASE}/include" \
- CXXFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ QMAKESPEC="${QMAKESPEC}"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
+CXXFLAGS+= -I${LOCALBASE}/include
MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
.if defined(CXX) && ${CXX:M*icc}
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index e1e83b02a503..c5ec316026b2 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE= yes
USE_PERL5_BUILD=yes
CXXFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \
- OPENGLLIBDIR="${LOCALBASE}/lib" \
- LDFLAGS="${PTHREAD_LIBS}"
+ OPENGLLIBDIR="${LOCALBASE}/lib"
+LDFLAGS+= ${PTHREAD_LIBS}
ALL_TARGET= freebsd
USE_LDCONFIG= yes
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 63130e194da0..95b7b124ff75 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
post-install:
${MV} ${PREFIX}/bin/ee ${PREFIX}/bin/ElectricEyes
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 5762d4817fb9..f848c9e6e518 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -33,8 +33,8 @@ USE_AUTOTOOLS= automake:env autoconf:env
USE_GCC= 4.4+
USE_GL= glew glut
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= enblend.1 enfuse.1
PLIST_FILES= bin/enblend bin/enfuse
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index f563f4043e8b..7421938b6746 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -34,8 +34,7 @@ USE_GNOME= esound
USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_header_mpeg_h=no \
+CONFIGURE_ENV= ac_cv_header_mpeg_h=no \
ac_cv_header_libmpeg3_h=no \
ac_cv_header_decore_h=no \
ac_cv_header_avifile_h=no
@@ -43,8 +42,8 @@ CONFIGURE_ARGS= --with-ungif
PKGDEINSTALL= ${PKGINSTALL}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index e19c665dd7c7..6f1b8cd1d650 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gtk20
WANT_GNOME= 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
.include <bsd.port.pre.mk>
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 679b0d96dcfc..f752f1ce9e83 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -31,8 +31,8 @@ USE_GETTEXT= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= eog.schemas
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 3d6d8befc18f..138e3e2e2860 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME= gtk20 intlhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= CUPS "Use cups printing system" off \
NLS "Native language support" on
@@ -48,7 +48,6 @@ USE_GETTEXT= yes
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index 01e5f9998b54..00cc2609f646 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack
USE_LDCONFIG= 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/graphics/evince/Makefile b/graphics/evince/Makefile
index ec63f9257685..4d94d7ac9cc3 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -30,8 +30,8 @@ USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \
gnomedocutils ltasneededhack gconf2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.Evince.gschema.xml
GCONF_SCHEMAS= \
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 0f8cb3e1e567..a0dcaa9b67b1 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -23,7 +23,7 @@ USE_LDCONFIG= yes
MAN1= exiv2.1
ALLTARGET= all
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index 80d8466a6822..f7de2614857f 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -26,8 +26,6 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
LICENSE= GPLv2
PLIST_FILES= bin/exrblur bin/exrchr bin/exricamtm bin/exrnlm \
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index b32ea2a681f5..2b8f0f09de07 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -39,8 +39,8 @@ INSTALLS_OMF= yes
USE_LDCONFIG= yes
GCONF_SCHEMAS= f-spot.schemas
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-vendor-build-id=FreeBSD\ BSD\#\ Project
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 9efdcee9b0e8..f2a959ffcad1 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -27,7 +27,6 @@ MAN1= feh.1 feh-cam.1 gen-cam-menu.1
CFLAGS+= -I${LOCALBASE}/include -std=c99
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
post-patch:
@${REINPLACE_CMD} 's#share/man#man#' ${WRKSRC}/config.mk
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index f1b9b8ca177a..f63bf653e837 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -24,8 +24,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/player
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_XORG= x11 xaw xkbfile
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME}
PLIST_FILES= bin/swfplayer
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index c7d06aa708a6..ffba0f853228 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -19,6 +19,6 @@ USE_GMAKE= yes
USE_GNOME= imlib
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 7936aeded779..3f3b0da2f6ac 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -27,7 +27,7 @@ MAN1= fotoxx.1
ALL_TARGET= fotoxx
INSTALL_TARGET= install manpage
-MAKE_ENV+= LDFLAGS="-O3 -g -Wall -rdynamic -lexecinfo"
+LDFLAGS+= -O3 -g -Wall -rdynamic -lexecinfo
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 6cc7abb9a745..cd16a042dcbf 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -22,7 +22,8 @@ USE_LDCONFIG= yes
USE_XORG= ice xi
USE_GL= glu
CONFIGURE_ARGS= --disable-warnings
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-lusbhid"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lusbhid
USE_LDCONFIG= yes
DOCS= download.html freeglut.html freeglut_logo.png \
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 03f5df91b1c9..246b1fbbf771 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs imlib libartlgpl2
USE_GETTEXT= 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.pre.mk>
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 85e36a71ceb0..080d36722a8b 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -24,7 +24,6 @@ USE_BZIP2= yes
USE_GNOME= desktopfileutils libglade2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 347ff248a034..ae194aa0ce49 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+= -I${LOCALBASE}/include
do-build:
cd ${WRKSRC} ; make depend ; make
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index c6b7394764c7..87fd19fef0f1 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -17,8 +17,8 @@ COMMENT= GTK-based color picker
PLIST_FILES= bin/gcolor
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
pre-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index e8f8d3bd8f8e..6a3f4f978f41 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -16,8 +16,8 @@ COMMENT= A simple GTK+ 2.0 color selector
USE_GNOME= gtk20 gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= gcolor2.desktop
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index cacd72c8fbbf..1f30c8644f94 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -26,7 +26,7 @@ CONFLICTS= bazaar-1.*
USE_BZIP2= yes
SCRIPTDIR= ${FILESDIR}
-MAKE_ENV= WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= WRKSRC="${WRKSRC}"
MAKEFILE= ${FILESDIR}/Makefile.bsd
CPPFLAGS+= -DHAVE_ERRNO_H -DHAVE_FT2BUILD_H -DHAVE_LIBFREETYPE -DHAVE_LIBJPEG -DHAVE_LIBPNG \
-DHAVE_LIBZ -DHAVE_STDDEF_H -DHAVE_STDINT_H -DHAVE_STDLIB_H
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 77479790d8b5..5f538988e7c3 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -29,9 +29,9 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
BUILD_CANVAS="${BUILD_CANVAS}"
+CPPFLAGS+= -I${LOCALBASE}/include
BUILD_CANVAS?= no
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 2e3359dfa156..4f98d5febf69 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -30,8 +30,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME+= gnomehack glib20 ltverhack
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
CONFIGURE_ARGS= --enable-introspection=yes --with-libjasper
MAN1= gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 7c0f710f768f..487549f81830 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS= --docdir="${DOCSDIR}" \
--with-htmldir="${DOCSDIR}/html" \
--with-readmedir="${DOCSDIR}"
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS+= top_builddir="${WRKSRC}"
MAKE_JOBS_SAFE= yes
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 1ad0a7621b0e..9e22e6d72ba0 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -43,8 +43,8 @@ USE_RUBY= yes
RUBY_NO_RUN_DEPENDS= yes
USE_LDCONFIG= ${PREFIX}/lib/gegl-0.1
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
GEGL_MINOR= 105
PLIST_SUB+= GEGL_MINOR="${GEGL_MINOR}"
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 3feb4b733920..acfb62ffc034 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_PYTHON_RUN= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ${PORTNAME}.1 web2png.1
PLIST_FILES= bin/${PORTNAME} bin/web2png
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index a48da5ae678f..d2fe829575ba 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -27,7 +27,6 @@ NOX11SUFFIX= -nox11
USE_XORG= sm x11
PLIST_SUB+= X11=''
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.endif
post-install:
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index e4e778948c79..820f5f3efb6b 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
USE_GMAKE= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
OPTIONS= SPLASH "Show splash on startup" on \
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index b84dbcc38799..c0df2d0ad759 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -53,9 +53,9 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \
--docdir=${PREFIX}/share/doc/gimp \
--enable-default-binary \
--without-gnomevfs
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV= GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(GIMP_SLAVE)
WANT_GNOME= yes
diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile
index ddbe6555107d..ae3a1f320e53 100644
--- a/graphics/gimp-focusblur-plugin/Makefile
+++ b/graphics/gimp-focusblur-plugin/Makefile
@@ -30,8 +30,8 @@ MAKE_JOBS_SAFE= yes
PLUGIN_DIR?= libexec/gimp/2.2/plug-ins
PLIST_SUB= PLUGIN_DIR=${PLUGIN_DIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/graphics/gimp-gap/Makefile b/graphics/gimp-gap/Makefile
index 17b0a65e956f..1ca0c8346209 100644
--- a/graphics/gimp-gap/Makefile
+++ b/graphics/gimp-gap/Makefile
@@ -38,7 +38,7 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= intltool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 42295315d61a..7b0a61eca71e 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -36,8 +36,8 @@ USE_XORG= x11 xext xrandr
PLUGIN_DIR?= libexec/gimp/2.2/plug-ins
PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR}
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-O*:N-pipe}
CXXFLAGS:= ${CXXFLAGS:N-O*:N-pipe}
diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile
index 0edb1b8505d1..411f580f1df4 100644
--- a/graphics/gimp-lqr-plugin/Makefile
+++ b/graphics/gimp-lqr-plugin/Makefile
@@ -27,8 +27,8 @@ MAKE_JOBS_SAFE= yes
PLUGIN_DIR?= libexec/gimp/2.2/plug-ins
PLIST_SUB= PLUGIN_DIR=${PLUGIN_DIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|^bindir = .*|bindir = ${PREFIX}/${PLUGIN_DIR}|g' ${WRKSRC}/src/Makefile.in
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 8f559729ad6b..1c52edbe6cbb 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -44,8 +44,8 @@ CONFIGURE_ARGS= --disable-perl \
--enable-static \
--disable-print \
--with-desktop-dir=${LOCALBASE}/share
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/gimp-${PORTVERSION}
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index acc951725e4e..4e86714cde05 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -23,12 +23,12 @@ USE_PERL5_BUILD=yes
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- INTLTOOL_PERL="${PERL}"
+CONFIGURE_ENV= INTLTOOL_PERL="${PERL}"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --datadir="${PREFIX}/lib" \
--with-tutorial-path="${DOCSDIR}" \
--with-lib3ds-prefix="${LOCALBASE}"
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= giram.1
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 9ef580b81309..29895d3e281a 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= pkgconfig gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
- LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 076ccd56fa8a..d42917177d1c 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -23,15 +23,14 @@ USE_GL= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
MAN1= gliv.1
MANLANG= "" de fr ru
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
${MKDIR} ${PREFIX}/share/applications
diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile
index 86434c32ca5d..2455aa5b9156 100644
--- a/graphics/gltt/Makefile
+++ b/graphics/gltt/Makefile
@@ -19,8 +19,8 @@ USE_GL= gl glut
USE_FREETYPE= 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
CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype1 \
--with-ttf-libraries=${LOCALBASE}/lib \
--with-gl-includes=${LOCALBASE}/include \
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index cc47fbffc9d4..5aab641c9512 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -18,8 +18,8 @@ COMMENT= A small GNOME Icon Editor
USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint
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
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile
index 389abd11828c..7764a4aeca1d 100644
--- a/graphics/goom/Makefile
+++ b/graphics/goom/Makefile
@@ -19,8 +19,8 @@ USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-sdltest --enable-static
USE_LDCONFIG= yes
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index aec8b63d47a5..30496f8e6813 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-cdk
MAKE_JOBS_SAFE= yes
MAN1= gphoto2.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}
OPTIONS= AALIB "Enable command line capture preview (aalib)" on
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index b2e348fe601f..579491552213 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_GNOME= gnomehier gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN1= gqview.1
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 1a06298c0f7c..20396ef9e529 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_GNOME= gnomehier gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAKE_JOBS_SAFE= yes
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 7159ba9dcc68..3b0ac826b2da 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -109,10 +109,7 @@ CONFIGURE_ARGS+= --program-transform-name="s/x/x/" \
--disable-io --disable-ocaml --disable-java \
--disable-sharp
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- MISSING=${TRUE}
+CONFIGURE_ENV+= MISSING=${TRUE}
.if defined(WITH_TK)
CPPFLAGS+= -I${TK_INCLUDEDIR}
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile
index c35f73909037..ddfa66238578 100644
--- a/graphics/grx/Makefile
+++ b/graphics/grx/Makefile
@@ -20,8 +20,8 @@ USE_LDCONFIG= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \
--with-x11-base=${LOCALBASE}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
ALL_TARGET= libs
INSTALL_TARGET= install install-bin install-fonts install-info
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index f352f6468950..9b3c1d9181dd 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -58,7 +58,6 @@ USE_GETTEXT= yes
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile
index 74686adfc299..2399724e6d4e 100644
--- a/graphics/gstreamer-plugins-gl/Makefile
+++ b/graphics/gstreamer-plugins-gl/Makefile
@@ -23,8 +23,8 @@ USE_GSTREAMER= yes
USE_XORG= ice x11
USE_GL= gl glu glew
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS=--disable-examples
PLIST_SUB= VERSION="0.10"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index cc15fc14d3d6..9da8cc457a11 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -26,8 +26,8 @@ WANT_GSTREAMER= yes
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= gthumb.schemas gthumb-comments.schemas gthumb-image-viewer.schemas \
gthumb-importer.schemas gthumb-pixbuf-savers.schemas gthumb-slideshow.schemas \
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index 13d1d965de7d..65e829aeb4f1 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -43,9 +43,9 @@ USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
PATCHDIR= ${.CURDIR}/../../x11-toolkits/gtk20/files
CONFIGURE_ARGS= --enable-static --with-xinput=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
- -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \
+ -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/gtk-update-icon-cache
MAN1= gtk-update-icon-cache.1
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index a25a04171e86..41319cecb3d4 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -21,8 +21,8 @@ WANT_GNOME= yes
USE_GNOME= gnomehack gnomehier gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gtkam.1
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 78aa7c8fd7f4..641db45ab1d1 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-dps-includes=${LOCALBASE}/include \
--with-dps-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index 602ab843f34b..2f422c0575cd 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_GNOME= imlib
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; s|-O2|${CFLAGS}| ; \
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index f2dced425e05..d395d391215e 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_GNOME= gtk12
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_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile
index 8c15a1a1061a..1b09eb1a10e9 100644
--- a/graphics/gts/Makefile
+++ b/graphics/gts/Makefile
@@ -17,13 +17,12 @@ COMMENT= GNU Triangulated Surface Library
USE_GNOME= glib20 pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
OPTIONS= NETPBM "Build with libnetpbm support" off
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/graphics/icon-slicer/Makefile b/graphics/icon-slicer/Makefile
index b4d174e3a464..188ab8627dec 100644
--- a/graphics/icon-slicer/Makefile
+++ b/graphics/icon-slicer/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
USE_GNOME= 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/icon-slicer
diff --git a/graphics/icoutils/Makefile b/graphics/icoutils/Makefile
index ba4a96a30314..0e9801c0ead0 100644
--- a/graphics/icoutils/Makefile
+++ b/graphics/icoutils/Makefile
@@ -23,7 +23,6 @@ USE_BZIP2= yes
USE_PERL5_RUN= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
MAN1= extresso.1 genresscript.1 icotool.1 wrestool.1
@@ -32,8 +31,8 @@ PLIST_FILES= bin/extresso \
bin/icotool \
bin/wrestool
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 385c9ecc0438..0f91f7f6d8e3 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= gtk12 gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= imlib-config.1 imlib_config.1
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 58a01fd95e6e..1fd0a0298773 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig
USE_EFL= libtool_hack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
OPTIONS= JPEG "Enable jpeg image support" on \
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 255edce28765..29ee058e1f31 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -35,8 +35,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
INSTALLS_ICONS= yes
-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}
MAN1= inkscape.1
MAN1_EN= inkview.1
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 6b40eb47348a..c3e53beec902 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -28,7 +28,8 @@ USE_AUTOTOOLS= libtool aclocal automake autoconf
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_LDCONFIG= 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/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 55d3f8ed0308..b5d6c6eb0939 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -25,8 +25,8 @@ USE_ZIP= yes
USE_GNOME= lthack
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-shared --enable-static
USE_LDCONFIG= yes
diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile
index 8c139e4a0d34..40a1d7c85015 100644
--- a/graphics/jpeginfo/Makefile
+++ b/graphics/jpeginfo/Makefile
@@ -17,8 +17,8 @@ COMMENT= Generate listing and MD5, check jpegs for error, delete broken ones
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_ARGS= mandir=${MANPREFIX}/man
MAN1= jpeginfo.1
diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile
index 7b4b532a70ec..b206379e15f0 100644
--- a/graphics/jpegpixi/Makefile
+++ b/graphics/jpegpixi/Makefile
@@ -17,8 +17,8 @@ COMMENT= Useful to correct images from digtal camera with CCD defects
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MANLANG= "" de fi fr
MAN1= jpeghotp.1 jpegpixi.1
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index c3d18f663411..fb4085e557a0 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -31,8 +31,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_GL= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-docbook --without-graphviz \
--with-truetype=freetype2 --with-imagemagick --with-jpeg \
--with-python=${PYTHONBASE} --with-tiff --with-openexr \
diff --git a/graphics/kdc2tiff/Makefile b/graphics/kdc2tiff/Makefile
index 64230e969801..54ac173cf81c 100644
--- a/graphics/kdc2tiff/Makefile
+++ b/graphics/kdc2tiff/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/kdc2jpeg bin/kdc2tiff
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index ffcbf770a779..4e7037100995 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -23,14 +23,13 @@ USE_GL= gl
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-lib-GL
PLIST_FILES= bin/kludge3d
-CPPFLAGS= -I${LOCALBASE}/include \
+CPPFLAGS+= -I${LOCALBASE}/include \
-I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib \
+LDFLAGS+= -L${LOCALBASE}/lib \
-L${PYTHON_LIBDIR}/config ${PTHREAD_LIBS}
post-patch:
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index 4d85d76366e4..6529755cf096 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -25,9 +25,7 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="${PTHREAD_LIBS} -lcompat"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -lcompat"
DESKTOP_ENTRIES="Kudu" \
"Edit 3D models" \
diff --git a/graphics/lcms-python/Makefile b/graphics/lcms-python/Makefile
index c0ef45b2d57b..592e1d2a639f 100644
--- a/graphics/lcms-python/Makefile
+++ b/graphics/lcms-python/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= lcms.1:${PORTSDIR}/graphics/lcms
USE_PYTHON= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-python
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/lcms-1.19
PLIST_FILES= ${PYTHON_SITELIBDIR:C,${PREFIX}/?,,}/_lcms.so \
${PYTHON_SITELIBDIR:C,${PREFIX}/?,,}/lcms.py
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index a6d4b81f94af..ccc2ec84a2ed 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -19,9 +19,9 @@ COMMENT= Light Color Management System -- a color management library
USE_GNOME= gnomehack lthack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/lcms-1.19
diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index 2e0069d92009..7e1d20841cb9 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -17,9 +17,9 @@ COMMENT= Light Color Management System -- a color management library
USE_GNOME= gnomehack lthack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
OPTIONS= TIFFICC "Build color profile applier for TIFF" off \
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 0e2c7b974fa1..eba6598bd9d0 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -30,7 +30,6 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CXXFLAGS+= -I${LOCALBASE}/include
HAS_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --prefix=${PREFIX} --target=${TARGET} --vectorization=SSE
PLIST_SUB+= PORTVERSION=${PORTVERSION} LIBVERSION=${LIBVERSION}
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index 7a91cf3adff7..85c3b76cbc0f 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -24,7 +24,8 @@ MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool aclocal automake autoconf
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/makefile.linux
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 6c412de03438..31361ef50bc1 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -19,13 +19,12 @@ LICENSE= LGPL21 # (or later)
USE_ZIP= yes
USE_GL= glut
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= 3dsdump.1 lib3ds-config.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 5de7c9fc36e9..92419cfde5f8 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -43,8 +43,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-gallium
ALL_TARGET= default
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 990d002886e9..4f3db5362409 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -27,7 +27,6 @@ USE_BZIP2= yes
USE_XORG= xext
USE_GNOME= librsvg2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs \
--without-builtin-ungif --without-afterbase \
--with-x
@@ -36,8 +35,8 @@ MAKE_JOBS_UNSAFE= yes
MAN1= ascompose.1x
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 2307d97845bd..00b16320f591 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=0.8
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 98b9e6dad099..1e94691fc441 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
USE_GNOME= gnomehack gtk20
USE_AUTOTOOLS= autoconf libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
post-patch:
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 704e08eff56b..3c292cb61fe7 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -17,8 +17,8 @@ USE_BZIP2= yes
USE_GNOME= gnomehack ltverhack pkgconfig
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= --disable-docs
USE_LDCONFIG= yes
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index c43f13df447e..883ee5545284 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -26,8 +26,8 @@ USE_XORG= x11 xext xkbfile xt
WRKSRC= ${WRKDIR}/${DISTNAME}/lib
USE_AUTOTOOLS= libtool
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile
index 770caf37a860..4b6cf1b7c854 100644
--- a/graphics/libgfx/Makefile
+++ b/graphics/libgfx/Makefile
@@ -27,15 +27,14 @@ BUILD_WRKSRC= ${WRKSRC}/src
USE_GL= glu
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-gzstream --with-libtiff-lzw --with-x
ALL_TARGET= ${PORTNAME}.so
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CFLAGS+= -fPIC
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 2648d1131296..094b880b4da8 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -26,7 +26,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
MAN1= cube3d.1 ggi-demo.1 ggiteleserver.1 monitest.1
MAN3= ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
diff --git a/graphics/libggigcp/Makefile b/graphics/libggigcp/Makefile
index 97213bc9067c..7ad7a0040231 100644
--- a/graphics/libggigcp/Makefile
+++ b/graphics/libggigcp/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
MAN3= gcpBlendColor.3 \
gcpGetLuminance.3 \
diff --git a/graphics/libggimisc/Makefile b/graphics/libggimisc/Makefile
index d0b8a50ffe55..09770f5da372 100644
--- a/graphics/libggimisc/Makefile
+++ b/graphics/libggimisc/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
MAN3= ggiGetRayPos.3 \
ggiSetSplitline.3 \
diff --git a/graphics/libggiwmh/Makefile b/graphics/libggiwmh/Makefile
index ecaec478a5b1..4b7fe8a91aa6 100644
--- a/graphics/libggiwmh/Makefile
+++ b/graphics/libggiwmh/Makefile
@@ -24,7 +24,8 @@ USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
MAN3= ggiWmhIconify.3 \
ggiWmhInit.3 \
diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile
index 25e672e0ce47..39906334cf8d 100644
--- a/graphics/libgltext/Makefile
+++ b/graphics/libgltext/Makefile
@@ -23,7 +23,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
OPTIONS= EXAMPLES "Compile examples, need libglut" off
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 3ccfbabba8ef..35658ef9d531 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--enable-glade \
--disable-gtk-doc
-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/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index 0eec4b7d3ee5..baaf76a3603b 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -21,7 +21,8 @@ MAKE_JOBS_SAFE= yes
USE_GNOME= libxml2
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= --with-boost=${LOCALBASE}/include
OPTIONS= GNOME "GNOME support (needs gtk20)" on
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index fbf0a079ec70..b1dc587c3678 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -26,10 +26,10 @@ USE_GNOME= gtk20 glib20 pango atk
USE_AUTOTOOLS= autoconf:env autoheader:env aclocal:env \
automake:env libtool:env
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
- -I${LOCALBASE}/include/glib-2.0 \
- -I${LOCALBASE}/include/pango-1.0 \
- -I${LOCALBASE}/include/atk-1.0"
+CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
+ -I${LOCALBASE}/include/glib-2.0 \
+ -I${LOCALBASE}/include/pango-1.0 \
+ -I${LOCALBASE}/include/atk-1.0
CONFIGURE_ARGS= --with-png=${LOCALBASE} \
--with-jpeg=${LOCALBASE} \
--with-tiff=${LOCALBASE}
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 3e36473e84cd..49752b8b6572 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -23,10 +23,10 @@ USE_GNOME= gtk20 glib20 pango atk
USE_AUTOTOOLS= autoconf:env autoheader:env aclocal:env \
automake:env libtool:env
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
- -I${LOCALBASE}/include/glib-2.0 \
- -I${LOCALBASE}/include/pango-1.0 \
- -I${LOCALBASE}/include/atk-1.0"
+CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
+ -I${LOCALBASE}/include/glib-2.0 \
+ -I${LOCALBASE}/include/pango-1.0 \
+ -I${LOCALBASE}/include/atk-1.0
CONFIGURE_ARGS= --with-png=${LOCALBASE} \
--with-jpeg=${LOCALBASE} \
--with-tiff=${LOCALBASE}
diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index 4e82ec74d699..3e75027c56eb 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 9f63c230adb1..440eae3647b9 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_GNOME= gnomelibs gdkpixbuf
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
.include <bsd.port.mk>
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 6b64cba9bdc2..a39befe62f5e 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnomeprefix libgsf ltverhack gtk20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-svgz \
--with-croco \
--enable-gtk-theme
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index a4dda45e184e..9e302198aaa5 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -20,8 +20,8 @@ COMMENT= Abstraction library that sits between apps and visual plugin
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
.include <bsd.port.pre.mk>
diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile
index 4cac230b412d..7100614e1373 100644
--- a/graphics/libvisual04-plugins/Makefile
+++ b/graphics/libvisual04-plugins/Makefile
@@ -29,8 +29,8 @@ CONFIGURE_ARGS= --disable-alsa \
--disable-gforce \
--disable-jess \
--prefix=${PREFIX}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAJORMINOR= ${PORTVERSION:C/.[0-9]+$//}
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index d55cadcaf295..1f051a2160fb 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -19,9 +19,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_LDCONFIG= yes
VER= -0.4
PLIST_SUB= VER=${VER}
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index 623350e9f8a6..a5761f06b027 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_GL= glut
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index ce6db67ce937..efa41f528a10 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -29,7 +29,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 216d78a69f56..f950531a3f72 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -47,8 +47,8 @@ do-install:
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.pre.mk>
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
.if defined(WITH_NVIDIA_GL)
CFLAGS+= -DWITH_NVIDIA_GL=1
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index a79b4a5e33cc..6053459d5683 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -26,9 +26,9 @@ MAKE_ARGS= QTDIR="${QT_PREFIX}" CC="${CXX}" MOC="${MOC}" \
PORTDOCS= *
PLIST_FILES= bin/mview
-CPPFLAGS= -I. -Imesh -Imathvector \
+CPPFLAGS+= -I. -Imesh -Imathvector \
`pkg-config --cflags QtOpenGL glu`
-LDFLAGS= `pkg-config --libs QtOpenGL glu`
+LDFLAGS+= `pkg-config --libs QtOpenGL glu`
post-patch:
@${REINPLACE_CMD} -e 's|make |$$(MAKE) |g' ${WRKSRC}/Makefile
diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile
index 461f823cba7d..9753c97bb925 100644
--- a/graphics/metacam/Makefile
+++ b/graphics/metacam/Makefile
@@ -18,7 +18,6 @@ MAKE_JOBS_SAFE= yes
CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/metacam
PORTDOCS= README.canon README.casio
diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile
index 0bbd6687bd4f..6286be88a534 100644
--- a/graphics/metapixel/Makefile
+++ b/graphics/metapixel/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I.
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \
bin/metapixel-prepare bin/metapixel-sizesort \
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index b2f23e99beee..9b2ed3d96b5e 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= pkgconfig
USE_LDCONFIG= yes
USE_GL= glut
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 9c25c6025c12..3c13b74b0eec 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -24,13 +24,12 @@ USE_GNOME= gnomehack
USE_GMAKE= yes
USE_BISON= build
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ming
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
-CPPFLAGS= -I. -I.. -I${LOCALBASE}/include
-LDFLAGS= -L. -L.. -L${LOCALBASE}/lib
+CPPFLAGS+= -I. -I.. -I${LOCALBASE}/include
+LDFLAGS+= -L. -L.. -L${LOCALBASE}/lib
CFLAGS+= ${CPPFLAGS}
DOCS= HISTORY NEWS README TODO
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index bd41bbf41c93..f1c0302864d0 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -21,7 +21,7 @@ USE_GL= glut
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= 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.mk>
diff --git a/graphics/multican/Makefile b/graphics/multican/Makefile
index deceecd28d2f..5bd9f2abfb90 100644
--- a/graphics/multican/Makefile
+++ b/graphics/multican/Makefile
@@ -27,7 +27,7 @@ PORTDOCS= ChangeLog README TODO
.if ${OSVERSION} < 800069
LIB_DEPENDS= usb:${PORTSDIR}/devel/libusb
CFLAGS+= -I${LOCALBASE}/include # does not uphold CPPFLAGS
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
post-patch:
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index d5f756459aed..2b82655c8541 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -31,8 +31,8 @@ USE_OCAMLFIND_PLIST= yes
USE_OCAML_WASH= yes
OCAML_PKGDIRS= camlimages
USE_OCAML_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= PNG "Enable PNG support" on \
JPEG "Enable JPEG support" on \
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 45715a17597d..4218511be595 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -30,7 +30,8 @@ USE_PYTHON_BUILD= yes
USE_AUTOTOOLS= aclocal automake autoconf
USE_GMAKE= yes
CONFIGURE_ARGS= --without-fst --without-tesseract --with-iulib=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GCC= 4.2+
.include <bsd.port.pre.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 497543f51e1b..13ff91506828 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -36,7 +36,7 @@ PLIST_SUB+= VERSION=${DISTVERSION}
.if !defined(_BUILDING_OPENCV_CORE) && !defined(_BUILDING_OPENCV_PYTHON)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-opencv
LIB_DEPENDS+= opencv_core.2:${PORTSDIR}/graphics/opencv-core
-CMAKE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= *
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index a4f4e9b6f231..379925115b43 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -26,9 +26,9 @@ USE_GL= yes
USE_MOTIF= yes
USE_AUTOTOOLS= libtool
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= ARCH="${OPSYS:L}" \
- CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV= ARCH="${OPSYS:L}"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
NO_MTREE= yes
PLIST_SUB= ARCH=${OPSYS:L}
diff --git a/graphics/panoglview/Makefile b/graphics/panoglview/Makefile
index bda011f11a74..82c1c8af47c3 100644
--- a/graphics/panoglview/Makefile
+++ b/graphics/panoglview/Makefile
@@ -15,11 +15,11 @@ MAINTAINER= ii@any.com.ru
COMMENT= Panorama viewer using OpenGL
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -ftemplate-depth-64" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lwx_gtk2_gl-${WX_VERSION}" \
- WX_CONFIG_NAME=wxgtk2-${WX_VERSION}-config \
+CONFIGURE_ENV= WX_CONFIG_NAME=wxgtk2-${WX_VERSION}-config \
PATH="$${PATH}:${LOCALBASE}/bin"
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lwx_gtk2_gl-${WX_VERSION}
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -ftemplate-depth-64
USE_XORG= x11
USE_GMAKE= yes
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 62fccce757d2..265c325645e2 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -27,8 +27,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFALGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= xml2ps.1 passepartout.1x
diff --git a/graphics/pecl-qrencode/Makefile b/graphics/pecl-qrencode/Makefile
index 59e7e3b20ac6..a3996b5b9511 100644
--- a/graphics/pecl-qrencode/Makefile
+++ b/graphics/pecl-qrencode/Makefile
@@ -23,7 +23,7 @@ USE_PHPEXT= yes
USE_BZIP2= yes
CONFIGURE_ARGS= --with-qrencode=${LOCALBASE}
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS}
+CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/graphics/pfscalibration/Makefile b/graphics/pfscalibration/Makefile
index 420eab915873..03a21ed63a48 100644
--- a/graphics/pfscalibration/Makefile
+++ b/graphics/pfscalibration/Makefile
@@ -17,8 +17,8 @@ PFS_CPPFLAGS= -I${LOCALBASE}/include
PFS_LDFLAGS= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \
- LDFLAGS="${PFS_LDFLAGS}"
+CPPFLAGS+= ${PFS_CPPFLAGS}
+LDFLAGS+= ${PFS_LDFLAGS}
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index 251327926de0..be76d741ba7f 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -19,8 +19,8 @@ PFS_CPPFLAGS= -I${LOCALBASE}/include
PFS_LDFLAGS= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \
- LDFLAGS="${PFS_LDFLAGS}"
+CPPFLAGS+= ${PFS_CPPFLAGS}
+LDFLAGS+= ${PFS_LDFLAGS}
USE_GMAKE= yes
MAN1= pfstmo_pattanaik00.1 \
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 565184842951..1048d0ccb485 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -25,9 +25,9 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= ${PFS_BUILD}
CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab \
--with-bash=${LOCALBASE}/bin/bash
-CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \
- LDFLAGS="${PFS_LDFLAGS}" \
- PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
+CONFIGURE_ENV= PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
+CPPFLAGS+= ${PFS_CPPFLAGS}
+LDFLAGS+= ${PFS_LDFLAGS}
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index ffd8ee396467..bee26b1e67c0 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -29,7 +29,6 @@ USE_PHPEXT= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
CONFIGURE_ARGS+= --with-facedetect
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index ba93f0b065f5..566513aa9bad 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -29,7 +29,6 @@ USE_GNOME= gnomehack
USE_GL= glu
USE_BISON= build
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --includedir=${PREFIX}/include/pixie \
--libdir=${PREFIX}/lib/pixie \
--with-docdir=${DOCSDIR} \
@@ -46,8 +45,8 @@ MAN1= rndr.1 sdrc.1 sdrinfo.1 texmake.1
PORTDOCS= *
CFLAGS+= -fPIC
-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/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 902bdbaed90c..fca4f488b6a4 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_MOTIF= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-libplotter --enable-libxmi --with-motif
USE_LDCONFIG= yes
diff --git a/graphics/pngnq/Makefile b/graphics/pngnq/Makefile
index 22d253bf4d68..57e05cd768a5 100644
--- a/graphics/pngnq/Makefile
+++ b/graphics/pngnq/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" LIBS=-lpng
+CONFIGURE_ENV+= LIBS=-lpng
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= pkgconfig
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index f4b72e4e420c..5cde3380abc5 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -30,10 +30,8 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-zlib \
--enable-xpdf-headers \
--with-html-dir=${DOCSDIR}
-CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}
-LDFLAGS=-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if !defined(SLAVEPORT)
OPTIONS= CAIRO "Enable cairo output backend" on \
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 215af9a769e2..687fab04bac2 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -22,8 +22,8 @@ USE_XORG= x11 xi xext xinerama
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_LIBXINE)
LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine
diff --git a/graphics/ppminfo/Makefile b/graphics/ppminfo/Makefile
index 60c8a2184a27..b87a9f5ae90e 100644
--- a/graphics/ppminfo/Makefile
+++ b/graphics/ppminfo/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm
PLIST_FILES= bin/${PORTNAME}
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} 's|min(|MIN(|;s|max(|MAX(|' ${WRKSRC}/pi.c
diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile
index 863a168531de..d574ed59797f 100644
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -31,8 +31,8 @@ MAN1= pqiv.1
PORTDOCS= README
PLIST_FILES= bin/pqiv
-CPPFLAGS= `${pkgconfig_DETECT} --cflags gtk+-2.0 gthread-2.0`
-LDFLAGS= `${pkgconfig_DETECT} --libs gtk+-2.0 gthread-2.0`
+CPPFLAGS+= `${pkgconfig_DETECT} --cflags gtk+-2.0 gthread-2.0`
+LDFLAGS+= `${pkgconfig_DETECT} --libs gtk+-2.0 gthread-2.0`
.include <bsd.port.pre.mk>
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index b1db6a0cb871..1fa86f69efde 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -24,16 +24,15 @@ OPTIONS= IMAGEMAGICK "Enable magick++ interface" on \
USE_GNOME= gnomehack pkgconfig
USE_GHOSTSCRIPT= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
MAN1= pstoedit.1
CFLAGS+= -DHAVE_LIBGD
-CPPFLAGS= -I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
+CPPFLAGS+= -I${LOCALBASE}/include/ming -I${LOCALBASE}/include \
-I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 6767aceef051..95ea87c16036 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -23,8 +23,8 @@ USE_PYTHON= 2.6-2.7
USE_GMAKE= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
index b31ebf446840..a5c215ea772b 100644
--- a/graphics/py-clutter-gtk/Makefile
+++ b/graphics/py-clutter-gtk/Makefile
@@ -26,7 +26,6 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pygnome2 pygtk2
USE_PYTHON= 2.5+
CONFIGURE_ARGS= --disable-docs
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 7542389611fb..99fdd874aa9b 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -28,7 +28,6 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pygnome2 pygtk2
USE_PYTHON= 2.5+
CONFIGURE_ARGS= --disable-docs
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 95ddb6752f66..73672f9a216c 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -27,6 +27,5 @@ USE_PYDISTUTILS=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index e1c966939c46..c36fd3d8fb5a 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -24,7 +24,7 @@ USE_FREETYPE= yes
USE_GNOME= libartlgpl2
NO_WRKSUBDIR= yes
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype1
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index c65c2777fd1f..db91fb4e2328 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --disable-docs
.endif
CONFIGURE_ENV= PYTHONPATH=${PYTHON_LIBDIR}
CFLAGS+= ${PTHREAD_CFLAGS}
-MAKE_ENV= LDFLAGS="${LDFLAGS} ${PTREAD_LIBS}"
+LDFLAGS+= ${PTREAD_LIBS}
VPYTHON_SCRIPT= bin/vpython.in
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index b7a210366efc..88ed4a9b2f98 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -28,15 +28,14 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GL= glu
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
ALL_TARGET= # none
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= -DMIX_ANSI_IOSTREAMS -fpermissive -fPIC ${CPPFLAGS}
MAKE_ARGS+= CC="${CC}" CXX="${CXX}"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
+MAKE_ENV+= FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
post-extract:
@${RM} -rf ${WRKSRC}/libgfx/
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 0cf809177a60..6b5249228148 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
USE_XORG= xext
USE_GL= gl glut
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
- LIBS="-lXext -lGL" FLUID="${LOCALBASE}/bin/fluid"
+CONFIGURE_ENV= LIBS="-lXext -lGL" FLUID="${LOCALBASE}/bin/fluid"
+CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
.if defined(WITH_OPTIMIZED_CFLAGS)
CFLAGS+= -O3 -ffast-math
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index 1e977b9111e9..22dcc6142631 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -25,7 +25,8 @@ USE_GNOME= gnomehack
USE_GL= gl glu glut
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# needs GLEW MX (multiple rendering contexts), so system glew won't go
CONFIGURE_ARGS= --without-glew --with-fribidi
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 30b98a693a91..928815070799 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -26,8 +26,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gtk20 libxml2 gconf2 desktopfileutils gnomehack
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 4633484ad506..1597b00903a1 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -26,7 +26,6 @@ USE_GL= glut
USE_GNOME= gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= biof.1 busyspheres.1 colorfire.1 cyclone.1 drempels.1 \
euphoria.1 feedback.1 fieldlines.1 flocks.1 flux.1 \
@@ -34,8 +33,8 @@ MAN1= biof.1 busyspheres.1 colorfire.1 cyclone.1 drempels.1 \
lorenz.1 matrixview.1 pixelcity.1 plasma.1 skyrocket.1 \
solarwinds.1 spirographx.1 sundancer2.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/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index e9225db69f89..d84a3bbb2416 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -24,10 +24,9 @@ USE_RUBY= yes
USE_RUBY_SETUP= yes
RUBY_SETUP= setup.rb
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- RUBY="${RUBY}"
+CONFIGURE_ENV= RUBY="${RUBY}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --doc-dir="${RUBY_MODDOCDIR}" --prefix="${PREFIX}" \
--allow-example-errors
.if defined(NOPORTDOCS)
diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile
index 1825d6477f20..ce07e4139a4f 100644
--- a/graphics/sage/Makefile
+++ b/graphics/sage/Makefile
@@ -23,7 +23,7 @@ USE_SDL= sdl
MAN3= sage.3 sage_init.3
-CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/configure
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index a1fba3cfbccc..449a2a884e9d 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -31,7 +31,6 @@ OPTIONS= USB "USB support" on \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \
--disable-latex \
--disable-locking \
@@ -45,8 +44,8 @@ SUB_FILES+= pkg-message
USERS= saned
GROUPS= saned
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include "Makefile.man"
.include <bsd.port.pre.mk>
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 17fb9dd9413e..283e99dfacce 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS= sane.1:${PORTSDIR}/graphics/sane-backends
USE_GMAKE= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= scanadf.1 xcam.1 xscanimage.1
SUB_FILES= pkg-message
diff --git a/graphics/scale2x/Makefile b/graphics/scale2x/Makefile
index c18aa25ca957..c47d9cd92939 100644
--- a/graphics/scale2x/Makefile
+++ b/graphics/scale2x/Makefile
@@ -17,13 +17,12 @@ COMMENT= Real-time graphics effect able to increase the size of small bitmaps
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= scalex.1 scalerx.1
PLIST_FILES= bin/scalex bin/scalerx
-CPPFLAGS= `libpng14-config --I_opts`
-LDFLAGS= `libpng14-config --L_opts`
+CPPFLAGS+= `libpng14-config --I_opts`
+LDFLAGS+= `libpng14-config --L_opts`
post-patch:
${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index 3d00149f31d5..9972c1b5d9b1 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -24,8 +24,8 @@ USE_SDL= sdl
USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lm"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lm
CONFIGURE_ARGS= --enable-tif --enable-xcf
USE_LDCONFIG= yes
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index def82f9ccfcb..dc6730a2f396 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -21,8 +21,8 @@ USE_SDL= sdl
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
USE_LDCONFIG= yes
.if !defined(WITHOUT_X11) && !defined(WITHOUT_GL)
diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile
index f8d2c7c3bf59..65ebf2f5a1d2 100644
--- a/graphics/seejpeg/Makefile
+++ b/graphics/seejpeg/Makefile
@@ -25,8 +25,8 @@ MAN1= seejpeg.1
MANCOMPRESSED= yes
PLIST_FILES= bin/seejpeg
USE_GMAKE= yes
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
${CHMOD} 0644 ${WRKSRC}/Makefile
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 2ce519c2749e..695bff1f1021 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -22,11 +22,10 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
USE_GNOME= gnomehack
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-mpeg2enc
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile
index 89bca5790852..3b193d2cbc74 100644
--- a/graphics/sng/Makefile
+++ b/graphics/sng/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \
--with-rgbtxt=${LOCALBASE}/lib/X11/rgb.txt
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index c5e6342e346d..67564cff3f0d 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-gnome-print \
--with-popt
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= sodipodi.1
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index 0b57a779980e..ff4d8e04d7db 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -24,14 +24,13 @@ USE_GNOME= pkgconfig
USE_BISON= build
USE_ICONV= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
PLIST_SUB= VERSION="${PORTVERSION}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITH_DEBUG)
CONFIGURE_ARGS+= --disable-debug --disable-yydebug
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index b7a673bb68b6..3728806d80c9 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -17,9 +17,8 @@ COMMENT= Adds a graphical, configurable timestamp to a grayscale image
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
.if !defined(WITHOUT_X11)
USE_GNOME= gtk12
.endif
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 8211a88c5c27..24dc668cba27 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack gtk20 ltverhack
USE_GSTREAMER= core good mp3 ffmpeg
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION:R}
diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile
index 788206a49de9..e1a0fd71ef2c 100644
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool
USE_GNOME= pkgconfig libxml2 libxslt
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" PKG_CONFIG=${LOCALBASE}/bin/pkg-config
+CONFIGURE_ENV+= PKG_CONFIG=${LOCALBASE}/bin/pkg-config
USE_LDCONFIG= YES
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index 0df5921072b9..b550d7170309 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -32,8 +32,7 @@ USE_GNOME= pkgconfig
USE_GL= glut
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_lib_zzip_zzip_file_open=no
+CONFIGURE_ENV= ac_cv_lib_zzip_zzip_file_open=no
MAKE_JOBS_SAFE= yes
@@ -41,8 +40,8 @@ MAN1= as3compile.1 font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 \
png2swf.1 swfbbox.1 swfc.1 swfcombine.1 swfdump.1 \
swfextract.1 swfrender.1 swfstrings.1 wav2swf.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/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 6637bc8511a5..99814e25c882 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
post-patch:
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 4e4bc01cec3d..840bb92eb985 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -24,7 +24,6 @@ USE_EFL= imlib2
MAKE_JOBS_SAFE= yes
ALL_TARGET= ${PORTNAME}
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/telak
MAN1= telak.1
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 26eee78a9ff9..2bf788bdd406 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -24,8 +24,8 @@ OPTIONS= NLS "Enable native language support" on \
USE_IMAKE= yes
PORTDOCS= HISTORY README
USE_XORG= x11 xext xt sm ice
-MAKE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
MAN1= tgif.1
diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile
index c5f1c17bdd7e..56913aec679b 100644
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES= bin/tiff2png
CFLAGS+= -DINVERT_MINISWHITE -DFAXPECT -DDEFAULT_DESTDIR_IS_CURDIR \
-I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
+LDFLAGS+= -L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tiff2png ${PREFIX}/bin
diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile
index 4dbf7934952b..28d82adb3e3b 100644
--- a/graphics/tkpng/Makefile
+++ b/graphics/tkpng/Makefile
@@ -28,8 +28,7 @@ CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-tclinclude=${TCL_INCLUDEDIR}/generic \
--with-tkinclude=${TK_INCLUDEDIR}/generic \
--exec-prefix=${PREFIX} --enable-shared
-CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+= -I${TK_INCLUDEDIR}/generic -I${LOCALBASE}/include
TKPKG= ${PORTNAME}${PORTVERSION}
PLIST_SUB= VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER}
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index e063d2c30224..970457333933 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -24,8 +24,8 @@ USE_GL= yes
USE_XORG= x11 xt xmu
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include/tk8.4" \
- LDFLAGS="-L${LOCALBASE}/lib/tk8.4"
+LDFLAGS+= -L${LOCALBASE}/lib/tk8.4
+CFLAGS+= -I${LOCALBASE}/include/tk8.4
CONFIGURE_ARGS= --with-tk=${LOCALBASE}/lib/tk8.4 \
--with-tcl=${LOCALBASE}/lib/tcl8.4 \
--with-tclinclude=${LOCALBASE}/include/tcl8.4 \
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 1da8edc7f936..838ae9e39f33 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -27,13 +27,12 @@ USE_GL= gl
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= truevision.1
-CPPFLAGS= -I${LOCALBASE}/include \
+CPPFLAGS+= -I${LOCALBASE}/include \
`pkg-config --cflags gtkglext-1.0`
-LDFLAGS= -L${LOCALBASE}/lib \
+LDFLAGS+= -L${LOCALBASE}/lib \
`pkg-config --libs gtkglext-1.0`
post-patch:
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 9a1f77ce6137..182c5551ac47 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -25,9 +25,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk20 glib20 gnomehack intltool intlhack libartlgpl2 pkgconfig
-LDFLAGS= -L"${LOCALBASE}/lib" ${PTHREAD_LIBS}
-CPPFLAGS= -I"${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+= -L"${LOCALBASE}/lib" ${PTHREAD_LIBS}
+CPPFLAGS+= -I"${LOCALBASE}/include"
PC_FALSE+= cinepaint
OPTIONS= CONTRAST "Enable contrast setting" on \
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 7ab472edfa7e..4b66107183d6 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -16,7 +16,6 @@ COMMENT= An image viewer for X
USE_SDL= image
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= vp.1
PLIST_FILES= bin/vp
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 84970954fef2..1385474717d2 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -28,16 +28,15 @@ USE_MOTIF= yes
USE_GL= gl glu glut
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- YACC="/usr/bin/byacc"
+CONFIGURE_ENV= YACC="/usr/bin/byacc"
CONFIGURE_ARGS= --with-optimization \
--without-devil \
--with-helpurl="${DOCSDIR}/index.html" \
--with-vrml97am1url="${DOCSDIR}/vrml97Amendment1" \
--with-x3ddrafturl="${DOCSDIR}/x3dDraft" \
--with-scriptednodesurl="${DOCSDIR}/scriptedNodes"
-CPPFLAGS= `${SDL_CONFIG} --cflags` -DUSBHID_UCR_DATA -DUSBHID_NEW -D__FREEBSD__
-LDFLAGS= `${SDL_CONFIG} --libs`
+CPPFLAGS+= `${SDL_CONFIG} --cflags` -DUSBHID_UCR_DATA -DUSBHID_NEW -D__FREEBSD__
+LDFLAGS+= `${SDL_CONFIG} --libs`
ALL_TARGET= dune
MAN1= dune.1 illegal2vrml.1
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index c24563f0f524..41bdf965f2da 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -22,8 +22,8 @@ USE_AUTOTOOLS= automake
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= libartlgpl2
USE_GMAKE= yes
USE_WX= 2.8
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 098b84329a12..5c2171e525e4 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -24,8 +24,8 @@ OPTIONS= PTHREAD "Enable SMP support (experimental)" off \
GTK2 "GTK+ User Interface (experimental)" off \
NLS "Native Language Support" on
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-aa-driver=no --with-dga-driver=no \
--with-ggi-driver=no --with-svga-driver=no \
--with-sffe=no
@@ -41,8 +41,8 @@ DESKTOP_ENTRIES= "XaoS" "Fractal zoomer" "" "xaos" "" false
.if defined(WITH_PTHREAD)
CONFIGURE_ARGS+= --with-pthread=yes
-CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" \
- CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}"
+CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
.else
CONFIGURE_ARGS+= --with-pthread=no
.endif
diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index e8611ef1b0b7..34a53fc93af1 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -29,8 +29,8 @@ OPTIONS= X11 "With X11" on \
WANT_GNOME= yes
USE_SUBMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --includedir=${PREFIX}/include/xmedcon \
--enable-llcheck
USE_LDCONFIG= yes
diff --git a/graphics/xmms-blursk/Makefile b/graphics/xmms-blursk/Makefile
index 4c6ea8e25083..8f94eff4b056 100644
--- a/graphics/xmms-blursk/Makefile
+++ b/graphics/xmms-blursk/Makefile
@@ -25,7 +25,7 @@ USE_XORG= x11 xv
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${CFLAGS} ${PTHREAD_CFLAGS}"
+CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS}
post-patch:
@${REINPLACE_CMD} -e 's|-O2||' \
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index 04ba978c4b8f..e7f63c28db0f 100644
--- a/graphics/xmms-nebulus/Makefile
+++ b/graphics/xmms-nebulus/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gtk12
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index c3fad601ddae..faf3acaee05b 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include/libxml2/libxml"
+CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml
USE_GL= glut
GNU_CONFIGURE= yes
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 8fe5715eee0c..e5251f01f65a 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -24,8 +24,8 @@ CONFLICTS= libmorph*
WANT_GNOME= yes
USE_XORG= xbitmaps x11 xaw xext
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-waili
USE_LDCONFIG= yes
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index b01fbb88ceec..c30790bfd50f 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -30,8 +30,8 @@ CONFLICTS= poppler-utils-0.*
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-opi \
--with-t1-library="${LOCALBASE}/lib" \
--with-t1-includes="${LOCALBASE}/include" \
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index c18df99e6db9..7c40ba61b299 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_GMAKE= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= xsane.1
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index de7d7e54ba15..4b5ebaea07f4 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+= --with-qt=no
PLIST_SUB+= QT4="@comment "
.endif
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index e9fb2e1d4374..10c03be738a8 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -25,9 +25,9 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include \
- ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include \
+ ${PTHREAD_CFLAGS}
USE_EFL= imlib2
.if defined (WITH_WXGTK2)
USE_WX= 2.4