aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.cmake.mk7
-rw-r--r--Mk/bsd.database.mk1
-rw-r--r--Mk/bsd.efl.mk6
-rw-r--r--Mk/bsd.gnustep.mk1
-rw-r--r--Mk/bsd.kde.mk6
-rw-r--r--Mk/bsd.ncurses.mk4
-rw-r--r--Mk/bsd.openssl.mk8
-rw-r--r--Mk/bsd.port.mk2
-rw-r--r--Mk/bsd.qt.mk3
-rw-r--r--accessibility/accerciser/Makefile4
-rw-r--r--accessibility/at-poke/Makefile4
-rw-r--r--accessibility/at-spi/Makefile4
-rw-r--r--accessibility/at-spi2-atk/Makefile4
-rw-r--r--accessibility/at-spi2-core/Makefile4
-rw-r--r--accessibility/atk/Makefile6
-rw-r--r--accessibility/atkmm/Makefile4
-rw-r--r--accessibility/dasher/Makefile4
-rw-r--r--accessibility/eflite/Makefile2
-rw-r--r--accessibility/gnome-mag/Makefile4
-rw-r--r--accessibility/gnome-speech/Makefile4
-rw-r--r--accessibility/gnopernicus/Makefile4
-rw-r--r--accessibility/gok/Makefile4
-rw-r--r--accessibility/mousetweaks/Makefile4
-rw-r--r--accessibility/orca/Makefile4
-rw-r--r--accessibility/py-atspi/Makefile4
-rw-r--r--accessibility/speech-dispatcher/Makefile2
-rw-r--r--archivers/dact/Makefile4
-rw-r--r--archivers/epkg/Makefile3
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--archivers/grzip/Makefile1
-rw-r--r--archivers/gtar/Makefile8
-rw-r--r--archivers/libarchive/Makefile3
-rw-r--r--archivers/libcomprex/Makefile4
-rw-r--r--archivers/liborange/Makefile2
-rw-r--r--archivers/libpar2/Makefile4
-rw-r--r--archivers/libunrar/Makefile1
-rw-r--r--archivers/libunrar4/Makefile1
-rw-r--r--archivers/lrzip/Makefile2
-rw-r--r--archivers/lzop/Makefile2
-rw-r--r--archivers/par2cmdline-tbb/Makefile4
-rw-r--r--archivers/pxz/Makefile1
-rw-r--r--archivers/rpm/Makefile4
-rw-r--r--archivers/rpm4/Makefile1
-rw-r--r--archivers/rpm5/Makefile5
-rw-r--r--archivers/unalz/Makefile4
-rw-r--r--archivers/unmakeself/Makefile2
-rw-r--r--archivers/xarchiver/Makefile4
-rw-r--r--astro/celestia/Makefile4
-rw-r--r--astro/fowsr/Makefile5
-rw-r--r--astro/glunarclock/Makefile6
-rw-r--r--astro/gpsdrive/Makefile4
-rw-r--r--astro/libroadnav/Makefile3
-rw-r--r--astro/mymoon/Makefile4
-rw-r--r--astro/nightfall/Makefile4
-rw-r--r--astro/nova/Makefile4
-rw-r--r--astro/openuniverse/Makefile6
-rw-r--r--astro/rmap/Makefile4
-rw-r--r--astro/roadnav/Makefile3
-rw-r--r--astro/starplot/Makefile4
-rw-r--r--astro/viking/Makefile4
-rw-r--r--astro/xplanet/Makefile4
-rw-r--r--astro/xtide/Makefile5
-rw-r--r--audio/adplay/Makefile1
-rw-r--r--audio/akode-plugins-ffmpeg/Makefile2
-rw-r--r--audio/akode-plugins-jack/Makefile2
-rw-r--r--audio/akode-plugins-mpc/Makefile2
-rw-r--r--audio/akode-plugins-mpeg/Makefile2
-rw-r--r--audio/akode-plugins-oss/Makefile2
-rw-r--r--audio/akode-plugins-pulseaudio/Makefile2
-rw-r--r--audio/akode-plugins-resampler/Makefile2
-rw-r--r--audio/akode-plugins-xiph/Makefile2
-rw-r--r--audio/alsa-plugins/Makefile4
-rw-r--r--audio/alsa-utils/Makefile6
-rw-r--r--audio/aqualung/Makefile5
-rw-r--r--audio/audacity-devel/Makefile4
-rw-r--r--audio/audacity/Makefile6
-rw-r--r--audio/audiere/Makefile6
-rw-r--r--audio/aumix/Makefile4
-rw-r--r--audio/blop/Makefile5
-rw-r--r--audio/bmp-mac/Makefile1
-rw-r--r--audio/cantus_3/Makefile3
-rw-r--r--audio/cowbell/Makefile3
-rw-r--r--audio/darkice/Makefile5
-rw-r--r--audio/denemo/Makefile4
-rw-r--r--audio/dvda-author/Makefile1
-rw-r--r--audio/easytag-devel/Makefile4
-rw-r--r--audio/easytag/Makefile4
-rw-r--r--audio/ecasound/Makefile5
-rw-r--r--audio/ermixer/Makefile4
-rw-r--r--audio/espeak/Makefile3
-rw-r--r--audio/extace/Makefile4
-rw-r--r--audio/ezstream/Makefile5
-rw-r--r--audio/faac/Makefile4
-rw-r--r--audio/faad/Makefile4
-rw-r--r--audio/firefly/Makefile8
-rw-r--r--audio/flac/Makefile2
-rw-r--r--audio/fluidsynth/Makefile5
-rw-r--r--audio/freealut/Makefile3
-rw-r--r--audio/ghostess/Makefile5
-rw-r--r--audio/gigedit/Makefile4
-rw-r--r--audio/gimmix/Makefile4
-rw-r--r--audio/glame/Makefile7
-rw-r--r--audio/gmpc-mserver/Makefile4
-rw-r--r--audio/gmpc/Makefile3
-rw-r--r--audio/gnapster/Makefile4
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/gnomoradio/Makefile4
-rw-r--r--audio/gogo-petit/Makefile3
-rw-r--r--audio/goobox/Makefile4
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/gqradio/Makefile4
-rw-r--r--audio/grip/Makefile4
-rw-r--r--audio/gspeakers/Makefile4
-rw-r--r--audio/gtick/Makefile2
-rw-r--r--audio/gtkpod/Makefile3
-rw-r--r--audio/hawkvoice/Makefile7
-rw-r--r--audio/icecast2/Makefile3
-rw-r--r--audio/ices/Makefile4
-rw-r--r--audio/ices0/Makefile4
-rw-r--r--audio/id3lib/Makefile5
-rw-r--r--audio/istream/Makefile2
-rw-r--r--audio/jack-rack/Makefile4
-rw-r--r--audio/jack/Makefile2
-rw-r--r--audio/julius/Makefile4
-rw-r--r--audio/ksmp3play/Makefile5
-rw-r--r--audio/lash/Makefile5
-rw-r--r--audio/liba52/Makefile4
-rw-r--r--audio/libcanberra/Makefile4
-rw-r--r--audio/libcddb/Makefile4
-rw-r--r--audio/libgpod/Makefile4
-rw-r--r--audio/libmp3splt/Makefile2
-rw-r--r--audio/libmtp/Makefile5
-rw-r--r--audio/libmusicbrainz/Makefile4
-rw-r--r--audio/libnjb/Makefile4
-rw-r--r--audio/libofa/Makefile4
-rw-r--r--audio/libshout2/Makefile4
-rw-r--r--audio/libsndfile/Makefile2
-rw-r--r--audio/libtunepimp-old/Makefile4
-rw-r--r--audio/libtunepimp/Makefile4
-rw-r--r--audio/linuxsampler/Makefile10
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/madplay/Makefile2
-rw-r--r--audio/mangler/Makefile1
-rw-r--r--audio/mhwaveedit/Makefile4
-rw-r--r--audio/milkytracker/Makefile1
-rw-r--r--audio/mixmos/Makefile4
-rw-r--r--audio/moc/Makefile5
-rw-r--r--audio/mp3_check/Makefile2
-rw-r--r--audio/mp3blaster/Makefile5
-rw-r--r--audio/mp3plot/Makefile5
-rw-r--r--audio/mp3splt-gtk/Makefile4
-rw-r--r--audio/mp3splt/Makefile3
-rw-r--r--audio/mpc/Makefile2
-rw-r--r--audio/mpg123/Makefile5
-rw-r--r--audio/mpg321/Makefile4
-rw-r--r--audio/mpiosh/Makefile4
-rw-r--r--audio/muine/Makefile4
-rw-r--r--audio/muse/Makefile5
-rw-r--r--audio/musicbox-tag-editor/Makefile4
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/ncmpc/Makefile4
-rw-r--r--audio/ncmpcpp/Makefile4
-rw-r--r--audio/normalize/Makefile5
-rw-r--r--audio/nosefart/Makefile3
-rw-r--r--audio/ocp/Makefile9
-rw-r--r--audio/openal-soft/Makefile2
-rw-r--r--audio/openal/Makefile3
-rw-r--r--audio/orpheus/Makefile2
-rw-r--r--audio/osalp/Makefile5
-rw-r--r--audio/pd/Makefile5
-rw-r--r--audio/pidgin-musictracker/Makefile3
-rw-r--r--audio/playgsf/Makefile4
-rw-r--r--audio/pms/Makefile4
-rw-r--r--audio/pocketsphinx/Makefile4
-rw-r--r--audio/pulseaudio/Makefile6
-rw-r--r--audio/py-pyliblo/Makefile4
-rw-r--r--audio/q-audio/Makefile1
-rw-r--r--audio/raop_play/Makefile2
-rw-r--r--audio/rezound/Makefile3
-rw-r--r--audio/rhythmbox/Makefile7
-rw-r--r--audio/rioutil/Makefile5
-rw-r--r--audio/rosegarden/Makefile2
-rw-r--r--audio/rplay/Makefile4
-rw-r--r--audio/ruby-xmms/Makefile4
-rw-r--r--audio/schism/Makefile5
-rw-r--r--audio/scrobbler/Makefile3
-rw-r--r--audio/sdl_mixer/Makefile6
-rw-r--r--audio/sdl_sound/Makefile3
-rw-r--r--audio/sidplayer/Makefile5
-rw-r--r--audio/smasher/Makefile4
-rw-r--r--audio/snd/Makefile5
-rw-r--r--audio/sound-juicer/Makefile4
-rw-r--r--audio/soundtracker/Makefile4
-rw-r--r--audio/sox/Makefile1
-rw-r--r--audio/speex/Makefile4
-rw-r--r--audio/sphinx3/Makefile4
-rw-r--r--audio/sphinxbase/Makefile4
-rw-r--r--audio/spiralsynthmodular/Makefile2
-rw-r--r--audio/streamripper/Makefile5
-rw-r--r--audio/streamtranscoder/Makefile3
-rw-r--r--audio/streamtuner/Makefile5
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/swhplugins/Makefile5
-rw-r--r--audio/tagger/Makefile4
-rw-r--r--audio/tagtool/Makefile5
-rw-r--r--audio/terminatorx/Makefile5
-rw-r--r--audio/timidity++/Makefile2
-rw-r--r--audio/timidity++/Makefile.interface2
-rw-r--r--audio/tse3/Makefile3
-rw-r--r--audio/umodplayer/Makefile5
-rw-r--r--audio/vagalume/Makefile4
-rw-r--r--audio/vorbis-tools/Makefile6
-rw-r--r--audio/vorbisgain/Makefile4
-rw-r--r--audio/wavbreaker/Makefile6
-rw-r--r--audio/wavpack/Makefile2
-rw-r--r--audio/whysynth/Makefile5
-rw-r--r--audio/wsoundserver/Makefile2
-rw-r--r--audio/wxguitar/Makefile3
-rw-r--r--audio/xmms-ahx/Makefile3
-rw-r--r--audio/xmms-audiofile/Makefile4
-rw-r--r--audio/xmms-cdread/Makefile2
-rw-r--r--audio/xmms-crossfade/Makefile1
-rw-r--r--audio/xmms-fc/Makefile7
-rw-r--r--audio/xmms-jack/Makefile5
-rw-r--r--audio/xmms-mad/Makefile5
-rw-r--r--audio/xmms-mp3cue/Makefile2
-rw-r--r--audio/xmms-wavpack/Makefile4
-rw-r--r--audio/xmms-xymms/Makefile3
-rw-r--r--audio/xmms2-scrobbler/Makefile2
-rw-r--r--audio/xsynth-dssi/Makefile5
-rw-r--r--audio/yamt/Makefile4
-rw-r--r--audio/zinf/Makefile5
-rw-r--r--benchmarks/forkbomb/Makefile3
-rw-r--r--benchmarks/gtkperf/Makefile4
-rw-r--r--benchmarks/iozone/Makefile2
-rw-r--r--benchmarks/iperf/Makefile2
-rw-r--r--benchmarks/polygraph/Makefile2
-rw-r--r--benchmarks/polygraph31/Makefile2
-rw-r--r--benchmarks/postal/Makefile1
-rw-r--r--benchmarks/sipp/Makefile4
-rw-r--r--benchmarks/webbench/Makefile1
-rw-r--r--biology/crux/Makefile1
-rw-r--r--biology/embassy/Makefile6
-rw-r--r--biology/mopac/Makefile5
-rw-r--r--biology/protomol/Makefile2
-rw-r--r--biology/xdrawchem/Makefile4
-rw-r--r--cad/brlcad/Makefile3
-rw-r--r--cad/geda-gattrib/Makefile4
-rw-r--r--cad/geda-gschem/Makefile4
-rw-r--r--cad/geda-netlist/Makefile4
-rw-r--r--cad/geda-symbols/Makefile4
-rw-r--r--cad/geda-symcheck/Makefile4
-rw-r--r--cad/geda-utils/Makefile4
-rw-r--r--cad/gerbv/Makefile5
-rw-r--r--cad/gwave/Makefile4
-rw-r--r--cad/irsim/Makefile2
-rw-r--r--cad/libgeda/Makefile4
-rw-r--r--cad/magic/Makefile5
-rw-r--r--cad/netgen/Makefile1
-rw-r--r--cad/opencascade-tutorial/Makefile2
-rw-r--r--cad/opencascade/Makefile5
-rw-r--r--cad/pcb/Makefile6
-rw-r--r--cad/salome/Makefile.ext2
-rw-r--r--chinese/oto/Makefile4
-rw-r--r--chinese/oxim/Makefile4
-rw-r--r--chinese/pcmanx/Makefile1
-rw-r--r--chinese/qterm/Makefile2
-rw-r--r--chinese/scim-array/Makefile1
-rw-r--r--chinese/scim-chewing/Makefile2
-rw-r--r--chinese/scim-fcitx/Makefile6
-rw-r--r--chinese/scim-pinyin/Makefile7
-rw-r--r--chinese/scim-tables/Makefile4
-rw-r--r--chinese/srecite/Makefile4
-rw-r--r--chinese/zhcon/Makefile4
-rw-r--r--comms/anyremote/Makefile4
-rw-r--r--comms/bforce/Makefile2
-rw-r--r--comms/dfu-programmer/Makefile3
-rw-r--r--comms/efax-gtk/Makefile1
-rw-r--r--comms/ghfaxviewer/Makefile4
-rw-r--r--comms/gmfsk/Makefile4
-rw-r--r--comms/gnocky/Makefile4
-rw-r--r--comms/gnokii/Makefile4
-rw-r--r--comms/gnuradio/Makefile4
-rw-r--r--comms/gsmlib/Makefile1
-rw-r--r--comms/hamlib/Makefile3
-rw-r--r--comms/kpsk/Makefile3
-rw-r--r--comms/libimobiledevice/Makefile2
-rw-r--r--comms/libticables/Makefile3
-rw-r--r--comms/libticables2/Makefile1
-rw-r--r--comms/libticalcs2/Makefile1
-rw-r--r--comms/linpsk/Makefile1
-rw-r--r--comms/linrad/Makefile4
-rw-r--r--comms/lirc/Makefile1
-rw-r--r--comms/nokryptia/Makefile3
-rw-r--r--comms/py-lirc/Makefile1
-rw-r--r--comms/scmxx/Makefile6
-rw-r--r--comms/spandsp/Makefile4
-rw-r--r--comms/tcpser/Makefile2
-rw-r--r--comms/tilp2/Makefile1
-rw-r--r--comms/tlf/Makefile2
-rw-r--r--comms/trustedqsl/Makefile3
-rw-r--r--comms/wsjt/Makefile4
-rw-r--r--comms/wspr/Makefile4
-rw-r--r--comms/xnecview/Makefile2
-rw-r--r--converters/ascii2binary/Makefile3
-rw-r--r--converters/cocot/Makefile3
-rw-r--r--converters/enca/Makefile4
-rw-r--r--converters/fix-mime-charset/Makefile4
-rw-r--r--converters/ical2html/Makefile4
-rw-r--r--converters/pdf2djvu/Makefile4
-rw-r--r--converters/rcctools/Makefile4
-rw-r--r--converters/recode/Makefile4
-rw-r--r--converters/uudeview/Makefile2
-rw-r--r--converters/xdeview/Makefile12
-rw-r--r--converters/ytnef/Makefile1
-rw-r--r--databases/animenfo-client-gtk/Makefile1
-rw-r--r--databases/beansdb/Makefile3
-rw-r--r--databases/cego/Makefile4
-rw-r--r--databases/clip/Makefile4
-rw-r--r--databases/cyrus-imspd/Makefile1
-rw-r--r--databases/dbtool/Makefile4
-rw-r--r--databases/dbview/Makefile2
-rw-r--r--databases/evolution-data-server/Makefile4
-rw-r--r--databases/firebird20-server/Makefile3
-rw-r--r--databases/firebird21-server/Makefile3
-rw-r--r--databases/firebird25-server/Makefile3
-rw-r--r--databases/flamerobin/Makefile2
-rw-r--r--databases/flare/Makefile3
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/freetds/Makefile4
-rw-r--r--databases/gbib/Makefile4
-rw-r--r--databases/gigabase/Makefile3
-rw-r--r--databases/glom/Makefile4
-rw-r--r--databases/gnome-db/Makefile4
-rw-r--r--databases/hk_classes/Makefile11
-rw-r--r--databases/libgda/Makefile4
-rw-r--r--databases/libgda2/Makefile4
-rw-r--r--databases/libgda3/Makefile4
-rw-r--r--databases/libgda4/Makefile4
-rw-r--r--databases/libgnomedb/Makefile4
-rw-r--r--databases/libiodbc/Makefile5
-rw-r--r--databases/libzdb/Makefile5
-rw-r--r--databases/luasql-mysql/Makefile3
-rw-r--r--databases/memcached/Makefile3
-rw-r--r--databases/memcached12/Makefile1
-rw-r--r--databases/memcachedb/Makefile3
-rw-r--r--databases/memcacheq/Makefile1
-rw-r--r--databases/mergeant/Makefile4
-rw-r--r--databases/my2cego/Makefile4
-rw-r--r--databases/mysql-connector-odbc/Makefile2
-rw-r--r--databases/mysql-proxy/Makefile4
-rw-r--r--databases/mysql-q4m/Makefile4
-rw-r--r--databases/mysql-workbench51/Makefile3
-rw-r--r--databases/mysql2odbc/Makefile3
-rw-r--r--databases/mysqlcppapi/Makefile4
-rw-r--r--databases/opendbx/Makefile1
-rw-r--r--databases/p5-BDB/Makefile2
-rw-r--r--databases/pecl-handlersocket/Makefile4
-rw-r--r--databases/pecl-rrd/Makefile2
-rw-r--r--databases/pgadmin3/Makefile3
-rw-r--r--databases/postgresql-tcltk/Makefile7
-rw-r--r--databases/postgresql82-server/Makefile2
-rw-r--r--databases/postgresql83-server/Makefile2
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql90-server/Makefile3
-rw-r--r--databases/postgresql91-server/Makefile3
-rw-r--r--databases/postgresql92-server/Makefile3
-rw-r--r--databases/pxlib/Makefile3
-rw-r--r--databases/pxtools/Makefile5
-rw-r--r--databases/qdbm/Makefile4
-rw-r--r--databases/rrdtool/Makefile1
-rw-r--r--databases/rrdtool12/Makefile1
-rw-r--r--databases/sqlcached/Makefile2
-rw-r--r--databases/sqlite3/Makefile4
-rw-r--r--databases/sqlrelay/Makefile4
-rw-r--r--databases/tokyotyrant/Makefile4
-rw-r--r--databases/virtuoso/Makefile4
-rw-r--r--deskutils/abacus/Makefile1
-rw-r--r--deskutils/alacarte/Makefile4
-rw-r--r--deskutils/babytrans/Makefile4
-rw-r--r--deskutils/bmp-docklet/Makefile4
-rw-r--r--deskutils/buoh/Makefile4
-rw-r--r--deskutils/calibre/Makefile3
-rw-r--r--deskutils/conduit/Makefile4
-rw-r--r--deskutils/contacts/Makefile3
-rw-r--r--deskutils/deskbar-applet/Makefile4
-rw-r--r--deskutils/dlume/Makefile4
-rw-r--r--deskutils/doodle/Makefile3
-rw-r--r--deskutils/drivel/Makefile5
-rw-r--r--deskutils/evolution-jescs/Makefile4
-rw-r--r--deskutils/fbreader/Makefile2
-rw-r--r--deskutils/ganyremote/Makefile4
-rw-r--r--deskutils/gdesklets/Makefile5
-rw-r--r--deskutils/genius/Makefile4
-rw-r--r--deskutils/gimmie/Makefile4
-rw-r--r--deskutils/glabels/Makefile4
-rw-r--r--deskutils/global-menu/Makefile5
-rw-r--r--deskutils/gnochm/Makefile4
-rw-r--r--deskutils/gnome-blog/Makefile4
-rw-r--r--deskutils/gnome-main-menu/Makefile6
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gnote/Makefile6
-rw-r--r--deskutils/gnotime/Makefile8
-rw-r--r--deskutils/google-gadgets/Makefile5
-rw-r--r--deskutils/gruler/Makefile4
-rw-r--r--deskutils/gtimer/Makefile5
-rw-r--r--deskutils/gtodo/Makefile4
-rw-r--r--deskutils/gucharmap/Makefile4
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile1
-rw-r--r--deskutils/hamster-applet/Makefile4
-rw-r--r--deskutils/kchmviewer/Makefile6
-rw-r--r--deskutils/kdepim3/Makefile2
-rw-r--r--deskutils/kickpim/Makefile2
-rw-r--r--deskutils/krefty/Makefile2
-rw-r--r--deskutils/libopensync-plugin-synce-legacy/Makefile2
-rw-r--r--deskutils/ljit/Makefile4
-rw-r--r--deskutils/logjam/Makefile4
-rw-r--r--deskutils/mdh/Makefile5
-rw-r--r--deskutils/multisync/Makefile3
-rw-r--r--deskutils/nautilus-actions/Makefile4
-rw-r--r--deskutils/nautilus-locked-folder/Makefile8
-rw-r--r--deskutils/nautilus-open-terminal/Makefile4
-rw-r--r--deskutils/nautilus-sendto/Makefile4
-rw-r--r--deskutils/notification-daemon/Makefile4
-rw-r--r--deskutils/ontv/Makefile3
-rw-r--r--deskutils/orage/Makefile4
-rw-r--r--deskutils/osmo/Makefile4
-rw-r--r--deskutils/pinot/Makefile3
-rw-r--r--deskutils/planner/Makefile4
-rw-r--r--deskutils/rubrica/Makefile5
-rw-r--r--deskutils/semantik/Makefile4
-rw-r--r--deskutils/simpleagenda/Makefile1
-rw-r--r--deskutils/superswitcher/Makefile4
-rw-r--r--deskutils/tagutils/Makefile4
-rw-r--r--deskutils/taskjuggler/Makefile4
-rw-r--r--deskutils/timer-applet/Makefile4
-rw-r--r--deskutils/xchm/Makefile4
-rw-r--r--deskutils/xfce4-volstatus-icon/Makefile4
-rw-r--r--deskutils/xneur/Makefile1
-rw-r--r--deskutils/xpad/Makefile4
-rw-r--r--devel/ORBit/Makefile4
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/aegis/Makefile4
-rw-r--r--devel/allegro/Makefile4
-rw-r--r--devel/anjuta-extras/Makefile4
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/avarice/Makefile3
-rw-r--r--devel/avr-binutils/Makefile4
-rw-r--r--devel/avrdude/Makefile3
-rw-r--r--devel/bennugd-modules/Makefile4
-rw-r--r--devel/binutils/Makefile2
-rw-r--r--devel/bison/Makefile4
-rw-r--r--devel/bonobo-conf/Makefile4
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/bug-buddy/Makefile4
-rw-r--r--devel/ccrtp/Makefile4
-rw-r--r--devel/cgdb/Makefile1
-rw-r--r--devel/cgit/Makefile4
-rw-r--r--devel/clanlib/Makefile1
-rw-r--r--devel/commoncpp/Makefile7
-rw-r--r--devel/cook/Makefile5
-rw-r--r--devel/cppcheck/Makefile2
-rw-r--r--devel/cppi/Makefile2
-rw-r--r--devel/cutter/Makefile2
-rw-r--r--devel/cvsd/Makefile1
-rw-r--r--devel/cxxtools/Makefile4
-rw-r--r--devel/datadesigner/Makefile4
-rw-r--r--devel/dbus-glib/Makefile4
-rw-r--r--devel/dbus-qt3/Makefile5
-rw-r--r--devel/dbus-sharp/Makefile6
-rw-r--r--devel/dbus/Makefile4
-rw-r--r--devel/dconf/Makefile4
-rw-r--r--devel/ddd/Makefile2
-rw-r--r--devel/desktop-file-utils/Makefile5
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/dia2code/Makefile4
-rw-r--r--devel/directfb/Makefile3
-rw-r--r--devel/distcc/Makefile5
-rw-r--r--devel/dklibs/Makefile4
-rw-r--r--devel/dprog/Makefile4
-rw-r--r--devel/dwarfdump/Makefile4
-rw-r--r--devel/eggdbus/Makefile4
-rw-r--r--devel/fastdep/Makefile1
-rw-r--r--devel/fga/Makefile2
-rw-r--r--devel/fhist/Makefile5
-rw-r--r--devel/g-wrap/Makefile2
-rw-r--r--devel/gamin/Makefile5
-rw-r--r--devel/gaul/Makefile4
-rw-r--r--devel/gconf/Makefile4
-rw-r--r--devel/gconf2/Makefile4
-rw-r--r--devel/gdb/Makefile2
-rw-r--r--devel/geany/Makefile4
-rw-r--r--devel/gearmand/Makefile6
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/giggle/Makefile4
-rw-r--r--devel/gindent/Makefile4
-rw-r--r--devel/gio-fam-backend/Makefile6
-rw-r--r--devel/glade2/Makefile4
-rw-r--r--devel/glade3/Makefile4
-rw-r--r--devel/glib-java/Makefile2
-rw-r--r--devel/glib20/Makefile6
-rw-r--r--devel/glog/Makefile2
-rw-r--r--devel/gnome-crash/Makefile4
-rw-r--r--devel/gnome-vfs-monikers/Makefile4
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnome-vfs1/Makefile4
-rw-r--r--devel/gnustep-make/Makefile3
-rw-r--r--devel/gob2/Makefile4
-rw-r--r--devel/gobject-introspection/Makefile4
-rw-r--r--devel/goffice/Makefile4
-rw-r--r--devel/goffice04/Makefile4
-rw-r--r--devel/goffice06/Makefile4
-rw-r--r--devel/goffice1/Makefile4
-rw-r--r--devel/gpsim/Makefile3
-rw-r--r--devel/gtranslator/Makefile4
-rw-r--r--devel/guichan/Makefile4
-rw-r--r--devel/guikachu/Makefile4
-rw-r--r--devel/gvfs/Makefile4
-rw-r--r--devel/idutils/Makefile4
-rw-r--r--devel/ixlib/Makefile4
-rw-r--r--devel/jna/files/patch-native_Makefile9
-rw-r--r--devel/json-glib/Makefile4
-rw-r--r--devel/jzmq/Makefile3
-rw-r--r--devel/kscope/Makefile3
-rw-r--r--devel/kyra/Makefile4
-rw-r--r--devel/lfcxml/Makefile4
-rw-r--r--devel/libIDL/Makefile4
-rw-r--r--devel/libassetml/Makefile4
-rw-r--r--devel/libast/Makefile4
-rw-r--r--devel/libbinio/Makefile6
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libccid/Makefile6
-rw-r--r--devel/libdlna/Makefile1
-rw-r--r--devel/libdwarf/Makefile4
-rw-r--r--devel/libelf/Makefile4
-rw-r--r--devel/libftdi/Makefile2
-rw-r--r--devel/libgalago/Makefile3
-rw-r--r--devel/libgconf-java/Makefile2
-rw-r--r--devel/libgdata/Makefile4
-rw-r--r--devel/libgiigic/Makefile3
-rw-r--r--devel/libglade-java/Makefile2
-rw-r--r--devel/libglade/Makefile4
-rw-r--r--devel/libglade2/Makefile4
-rw-r--r--devel/libgsf-gnome/Makefile4
-rw-r--r--devel/libgsf/Makefile4
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgutenfetch/Makefile4
-rw-r--r--devel/libical/Makefile4
-rw-r--r--devel/libleaftag/Makefile4
-rw-r--r--devel/libmaa/Makefile2
-rw-r--r--devel/libmba/Makefile4
-rw-r--r--devel/libnfc/Makefile4
-rw-r--r--devel/libnotify/Makefile4
-rw-r--r--devel/liboobs/Makefile2
-rw-r--r--devel/liboop/Makefile5
-rw-r--r--devel/libopensync022/Makefile2
-rw-r--r--devel/libopkele/Makefile7
-rw-r--r--devel/libpafe/Makefile4
-rw-r--r--devel/libphish/Makefile5
-rw-r--r--devel/libpthread-stubs/Makefile2
-rw-r--r--devel/librcc/Makefile5
-rw-r--r--devel/libsigcx/Makefile5
-rw-r--r--devel/libsoup/Makefile4
-rw-r--r--devel/libsoup22/Makefile4
-rw-r--r--devel/libtar/Makefile1
-rw-r--r--devel/libtifiles2/Makefile1
-rw-r--r--devel/libunicode/Makefile4
-rw-r--r--devel/libuninum/Makefile1
-rw-r--r--devel/libvanessa_adt/Makefile4
-rw-r--r--devel/libvanessa_socket/Makefile4
-rw-r--r--devel/libzrtpcpp/Makefile1
-rw-r--r--devel/libzvbi/Makefile3
-rw-r--r--devel/log4cplus/Makefile4
-rw-r--r--devel/log4cpp/Makefile3
-rw-r--r--devel/log4shib/Makefile3
-rw-r--r--devel/love/Makefile6
-rw-r--r--devel/love07/Makefile6
-rw-r--r--devel/love5/Makefile6
-rw-r--r--devel/luabind/Makefile4
-rw-r--r--devel/mico/Makefile3
-rw-r--r--devel/monotone/Makefile6
-rw-r--r--devel/newt/Makefile2
-rw-r--r--devel/oaf/Makefile4
-rw-r--r--devel/obby/Makefile3
-rw-r--r--devel/ocaml-sdl/Makefile4
-rw-r--r--devel/ois/Makefile3
-rw-r--r--devel/omniNotify/Makefile3
-rw-r--r--devel/omniORB/Makefile3
-rw-r--r--devel/pcre++/Makefile4
-rw-r--r--devel/pecl-statgrab/Makefile4
-rw-r--r--devel/picprog/Makefile2
-rw-r--r--devel/pikdev/Makefile2
-rw-r--r--devel/popt/Makefile4
-rw-r--r--devel/present/Makefile4
-rw-r--r--devel/protobuf-c/Makefile2
-rw-r--r--devel/ptlib26/Makefile4
-rw-r--r--devel/pwlib/Makefile11
-rw-r--r--devel/py-itools/Makefile2
-rw-r--r--devel/py-libgsf/Makefile4
-rw-r--r--devel/py-omniorb/Makefile3
-rw-r--r--devel/py-orbit/Makefile2
-rw-r--r--devel/py-shapely/Makefile1
-rw-r--r--devel/raknet/Makefile4
-rw-r--r--devel/regexx/Makefile2
-rw-r--r--devel/regexxer/Makefile4
-rw-r--r--devel/rsvndump/Makefile2
-rw-r--r--devel/sdl12/Makefile1
-rw-r--r--devel/seed/Makefile4
-rw-r--r--devel/sfslite-dbg/Makefile4
-rw-r--r--devel/shmap/Makefile4
-rw-r--r--devel/silc-toolkit/Makefile2
-rw-r--r--devel/simgear/Makefile1
-rw-r--r--devel/soup/Makefile4
-rw-r--r--devel/srecord/Makefile4
-rw-r--r--devel/styx/Makefile4
-rw-r--r--devel/subcommander/Makefile5
-rw-r--r--devel/subcommander2/Makefile4
-rw-r--r--devel/synfig/Makefile4
-rw-r--r--devel/tdl/Makefile1
-rw-r--r--devel/thunar-vcs-plugin/Makefile2
-rw-r--r--devel/tokamak/Makefile2
-rw-r--r--devel/ucommon/Makefile2
-rw-r--r--devel/urjtag/Makefile6
-rw-r--r--devel/wand-libconfig/Makefile2
-rw-r--r--devel/wininfo/Makefile26
-rw-r--r--devel/xdg-user-dirs/Makefile4
-rw-r--r--devel/xwpe/Makefile1
-rw-r--r--devel/yasm/Makefile4
-rw-r--r--devel/ztcl/Makefile6
-rw-r--r--dns/autotrust/Makefile3
-rw-r--r--dns/dhisd/Makefile1
-rw-r--r--dns/fastresolve/Makefile6
-rw-r--r--dns/ldapdns/Makefile1
-rw-r--r--dns/libidn/Makefile4
-rw-r--r--dns/posadis/Makefile3
-rw-r--r--editors/abiword/Makefile4
-rw-r--r--editors/conglomerate/Makefile4
-rw-r--r--editors/cooledit/Makefile5
-rw-r--r--editors/elvis/Makefile2
-rw-r--r--editors/emacs-devel/Makefile1
-rw-r--r--editors/emacs.app/Makefile2
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/emacs21/Makefile1
-rw-r--r--editors/emacs23/Makefile4
-rw-r--r--editors/fxite/Makefile1
-rw-r--r--editors/gedit-plugins/Makefile4
-rw-r--r--editors/gedit/Makefile4
-rw-r--r--editors/ghex/Makefile4
-rw-r--r--editors/glimmer/Makefile4
-rw-r--r--editors/gmanedit/Makefile4
-rw-r--r--editors/gnotepad+/Makefile5
-rw-r--r--editors/gobby/Makefile4
-rw-r--r--editors/gphpedit/Makefile4
-rw-r--r--editors/hte/Makefile3
-rw-r--r--editors/joe/Makefile4
-rw-r--r--editors/joe2/Makefile4
-rw-r--r--editors/leafpad/Makefile5
-rw-r--r--editors/libreoffice/Makefile3
-rw-r--r--editors/mlview/Makefile3
-rw-r--r--editors/morla/Makefile3
-rw-r--r--editors/nano/Makefile4
-rw-r--r--editors/nvi-devel/Makefile2
-rw-r--r--editors/openoffice-3-devel/Makefile4
-rw-r--r--editors/openoffice-3/Makefile4
-rw-r--r--editors/openoffice.org-3-RC/Makefile4
-rw-r--r--editors/openoffice.org-3-devel/Makefile4
-rw-r--r--editors/openoffice.org-3/Makefile4
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile4
-rw-r--r--editors/poedit/Makefile7
-rw-r--r--editors/rospell/Makefile2
-rw-r--r--editors/scribes/Makefile4
-rw-r--r--editors/texmacs/Makefile4
-rw-r--r--editors/vigor/Makefile2
-rw-r--r--editors/xmlcopyeditor/Makefile6
-rw-r--r--editors/xmleditor/Makefile4
-rw-r--r--editors/zile/Makefile1
-rw-r--r--emulators/advancemame/Makefile4
-rw-r--r--emulators/advancemenu/Makefile3
-rw-r--r--emulators/advancemess/Makefile4
-rw-r--r--emulators/atari800/Makefile3
-rw-r--r--emulators/bochs/Makefile5
-rw-r--r--emulators/cingb/Makefile5
-rw-r--r--emulators/dosbox/Makefile1
-rw-r--r--emulators/dynamips-community/Makefile3
-rw-r--r--emulators/dynamips-devel/Makefile3
-rw-r--r--emulators/dynamips/Makefile3
-rw-r--r--emulators/frodo/Makefile1
-rw-r--r--emulators/fuse/Makefile4
-rw-r--r--emulators/gbe/Makefile5
-rw-r--r--emulators/generator-cbiere/Makefile4
-rw-r--r--emulators/generator/Makefile4
-rw-r--r--emulators/gngb/Makefile5
-rw-r--r--emulators/gngeo/Makefile5
-rw-r--r--emulators/gnuboy/Makefile5
-rw-r--r--emulators/gxmame/Makefile2
-rw-r--r--emulators/hugo/Makefile2
-rw-r--r--emulators/jzintv/Makefile1
-rw-r--r--emulators/mednafen/Makefile1
-rw-r--r--emulators/mtools/Makefile3
-rw-r--r--emulators/o2em/Makefile2
-rw-r--r--emulators/open-vm-tools/Makefile4
-rw-r--r--emulators/pcsxr/Makefile1
-rw-r--r--emulators/qemu-devel/Makefile2
-rw-r--r--emulators/qemu/Makefile2
-rw-r--r--emulators/snes9x-gtk/Makefile4
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--emulators/stella/Makefile4
-rw-r--r--emulators/tiemu3/Makefile1
-rw-r--r--emulators/tpm-emulator/Makefile4
-rw-r--r--emulators/vice/Makefile1
-rw-r--r--emulators/visualos/Makefile4
-rw-r--r--emulators/wine-devel/Makefile6
-rw-r--r--emulators/wine/Makefile6
-rw-r--r--emulators/x48/Makefile2
-rw-r--r--emulators/xcpc/Makefile3
-rw-r--r--emulators/xsystem35/Makefile4
-rw-r--r--emulators/zsnes/Makefile1
-rw-r--r--finance/aqbanking/Makefile1
-rw-r--r--finance/gnofin/Makefile4
-rw-r--r--finance/gnucash-docs/Makefile2
-rw-r--r--finance/gnucash/Makefile2
-rw-r--r--finance/grisbi/Makefile4
-rw-r--r--finance/homebank/Makefile5
-rw-r--r--finance/ledger/Makefile1
-rw-r--r--finance/libofx/Makefile5
-rw-r--r--finance/quantlib/Makefile5
-rw-r--r--finance/quantlib/pkg-plist1
-rw-r--r--french/med/Makefile6
-rw-r--r--french/verbiste/Makefile5
-rw-r--r--ftp/curl/Makefile4
-rw-r--r--ftp/curlpp/Makefile4
-rw-r--r--ftp/filezilla/Makefile2
-rw-r--r--ftp/frox/Makefile2
-rw-r--r--ftp/gftp/Makefile4
-rw-r--r--ftp/gwget/Makefile4
-rw-r--r--ftp/kbear/Makefile3
-rw-r--r--ftp/pavuk/Makefile5
-rw-r--r--ftp/pureadmin/Makefile5
-rw-r--r--ftp/quftp/Makefile1
-rw-r--r--ftp/rexx-curl/Makefile3
-rw-r--r--ftp/urlgfe/Makefile2
-rw-r--r--ftp/vsftpd-ext/Makefile2
-rw-r--r--ftp/vsftpd/Makefile2
-rw-r--r--ftp/wgetpro/Makefile1
-rw-r--r--ftp/wput/Makefile5
-rw-r--r--ftp/wzdftpd/Makefile4
-rw-r--r--games/8kingdoms/Makefile1
-rw-r--r--games/abuse_sdl/Makefile5
-rw-r--r--games/adgali/Makefile4
-rw-r--r--games/adonthell/Makefile7
-rw-r--r--games/afternoonstalker/Makefile5
-rw-r--r--games/alienarena/Makefile4
-rw-r--r--games/allacrost/Makefile4
-rw-r--r--games/antrix/Makefile1
-rw-r--r--games/apricots/Makefile3
-rw-r--r--games/asc/Makefile5
-rw-r--r--games/atomix/Makefile4
-rw-r--r--games/atr3d/Makefile8
-rw-r--r--games/belooted/Makefile4
-rw-r--r--games/bitefusion/Makefile4
-rw-r--r--games/blokish/Makefile4
-rw-r--r--games/bomberclone/Makefile4
-rw-r--r--games/bomberinstinct/Makefile4
-rw-r--r--games/bombermaze/Makefile4
-rw-r--r--games/bomns/Makefile4
-rw-r--r--games/briquolo/Makefile3
-rw-r--r--games/bumprace/Makefile4
-rw-r--r--games/burgerspace/Makefile5
-rw-r--r--games/burrtools/Makefile4
-rw-r--r--games/bygfoot/Makefile3
-rw-r--r--games/bzflag/Makefile3
-rw-r--r--games/ceferino/Makefile1
-rw-r--r--games/chanta/Makefile1
-rw-r--r--games/chroma/Makefile5
-rw-r--r--games/chromium-bsu/Makefile4
-rw-r--r--games/concentration/Makefile5
-rw-r--r--games/connectfive/Makefile4
-rw-r--r--games/construo/Makefile4
-rw-r--r--games/corewars/Makefile4
-rw-r--r--games/cosmosmash/Makefile4
-rw-r--r--games/crack-attack/Makefile2
-rw-r--r--games/critterding/Makefile4
-rw-r--r--games/crossfire-client/Makefile4
-rw-r--r--games/crossfire-server/Makefile5
-rw-r--r--games/crrcsim/Makefile4
-rw-r--r--games/csmash/Makefile4
-rw-r--r--games/d2x-xl/Makefile3
-rw-r--r--games/d2x/Makefile3
-rw-r--r--games/daimonin/Makefile2
-rw-r--r--games/diameter/Makefile4
-rw-r--r--games/dopewars/Makefile4
-rw-r--r--games/duel/Makefile4
-rw-r--r--games/ember/Makefile2
-rw-r--r--games/enigma/Makefile4
-rw-r--r--games/exult/Makefile4
-rw-r--r--games/fillets-ng/Makefile3
-rw-r--r--games/fishsupper/Makefile4
-rw-r--r--games/fkiss/Makefile1
-rw-r--r--games/flightgear-atlas/Makefile5
-rw-r--r--games/flightgear/Makefile1
-rw-r--r--games/flyhard/Makefile4
-rw-r--r--games/foobillard/Makefile5
-rw-r--r--games/freeciv/Makefile3
-rw-r--r--games/freesci/Makefile2
-rw-r--r--games/garith/Makefile2
-rw-r--r--games/gbrainy/Makefile4
-rw-r--r--games/gcompris/Makefile6
-rw-r--r--games/ggz-client-libs/Makefile5
-rw-r--r--games/ggz-gtk-client/Makefile5
-rw-r--r--games/ggz-gtk-games/Makefile5
-rw-r--r--games/ggz-sdl-games/Makefile5
-rw-r--r--games/ggz-txt-client/Makefile5
-rw-r--r--games/gl-117/Makefile4
-rw-r--r--games/glest/Makefile4
-rw-r--r--games/glife/Makefile3
-rw-r--r--games/gltron/Makefile5
-rw-r--r--games/gno3dtet/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/gnomeattacks/Makefile4
-rw-r--r--games/gnomebreakout/Makefile4
-rw-r--r--games/gnomechess/Makefile4
-rw-r--r--games/gnomekiss/Makefile4
-rw-r--r--games/gnomememoryblocks/Makefile4
-rw-r--r--games/gnomermind/Makefile4
-rw-r--r--games/gnono/Makefile5
-rw-r--r--games/gnubg/Makefile7
-rw-r--r--games/gnurobots/Makefile5
-rw-r--r--games/gracer/Makefile7
-rw-r--r--games/greed/Makefile2
-rw-r--r--games/grhino/Makefile4
-rw-r--r--games/gtetrinet/Makefile4
-rw-r--r--games/gtkabale/Makefile4
-rw-r--r--games/gtkatlantic/Makefile4
-rw-r--r--games/gtkballs/Makefile4
-rw-r--r--games/gtktetcolor/Makefile5
-rw-r--r--games/gturing/Makefile4
-rw-r--r--games/hangman/Makefile6
-rw-r--r--games/heroes/Makefile7
-rw-r--r--games/hex-a-hop/Makefile1
-rw-r--r--games/highmoon/Makefile2
-rw-r--r--games/klavaro/Makefile5
-rw-r--r--games/koth/Makefile3
-rw-r--r--games/kuklomenos/Makefile5
-rw-r--r--games/lander/Makefile4
-rw-r--r--games/lbreakout2/Makefile5
-rw-r--r--games/lexter/Makefile4
-rw-r--r--games/lgeneral/Makefile5
-rw-r--r--games/lianliankan/Makefile4
-rw-r--r--games/libggz/Makefile5
-rw-r--r--games/lincity-ng/Makefile4
-rw-r--r--games/lincity/Makefile4
-rw-r--r--games/lordsawar/Makefile6
-rw-r--r--games/lpairs/Makefile3
-rw-r--r--games/ltris/Makefile4
-rw-r--r--games/macopix/Makefile5
-rw-r--r--games/madbomber/Makefile4
-rw-r--r--games/mangos/Makefile1
-rw-r--r--games/maxr/Makefile3
-rw-r--r--games/monkeybubble/Makefile4
-rw-r--r--games/monster-masher/Makefile4
-rw-r--r--games/mudmagic/Makefile4
-rw-r--r--games/naev/Makefile3
-rw-r--r--games/nethack33/Makefile3
-rw-r--r--games/nethack34/Makefile1
-rw-r--r--games/netpanzer-data/Makefile4
-rw-r--r--games/netpanzer/Makefile4
-rw-r--r--games/netspades/Makefile4
-rw-r--r--games/nighthawk/Makefile2
-rw-r--r--games/nimuh/Makefile4
-rw-r--r--games/njam/Makefile2
-rw-r--r--games/numptyphysics/Makefile5
-rw-r--r--games/openalchemist/Makefile2
-rw-r--r--games/openglad/Makefile2
-rw-r--r--games/openjazz/Makefile1
-rw-r--r--games/openmortal/Makefile4
-rw-r--r--games/opensonic/Makefile1
-rw-r--r--games/openyahtzee/Makefile5
-rw-r--r--games/orbital_eunuchs_sniper/Makefile5
-rw-r--r--games/pachi/Makefile2
-rw-r--r--games/pengupop/Makefile4
-rw-r--r--games/pinball/Makefile4
-rw-r--r--games/pinedit/Makefile4
-rw-r--r--games/pioneers/Makefile4
-rw-r--r--games/pipenightdreams/Makefile2
-rw-r--r--games/pipewalker/Makefile4
-rw-r--r--games/pongix/Makefile1
-rw-r--r--games/prboom/Makefile4
-rw-r--r--games/pushover/Makefile4
-rw-r--r--games/qonk/Makefile4
-rw-r--r--games/quetoo/Makefile6
-rw-r--r--games/race/Makefile2
-rw-r--r--games/ri-li/Makefile2
-rw-r--r--games/rtb/Makefile5
-rw-r--r--games/scorched3d/Makefile1
-rw-r--r--games/scourge/Makefile1
-rw-r--r--games/scramble/Makefile5
-rw-r--r--games/scummvm-tools/Makefile2
-rw-r--r--games/scummvm/Makefile3
-rw-r--r--games/sdb/Makefile2
-rw-r--r--games/secretmaryochronicles/Makefile4
-rw-r--r--games/shaaft/Makefile4
-rw-r--r--games/shootingstar/Makefile6
-rw-r--r--games/sjeng/Makefile4
-rw-r--r--games/spacejunk/Makefile5
-rw-r--r--games/stepmania-devel/Makefile4
-rw-r--r--games/super_methane_brothers/Makefile4
-rw-r--r--games/supertuxkart/Makefile4
-rw-r--r--games/taxipilot/Makefile3
-rw-r--r--games/teg/Makefile4
-rw-r--r--games/thevalley/Makefile4
-rw-r--r--games/tinymux/Makefile5
-rw-r--r--games/tmw/Makefile6
-rw-r--r--games/toppler/Makefile5
-rw-r--r--games/torcs/Makefile4
-rw-r--r--games/torrent/Makefile5
-rw-r--r--games/toycars/Makefile4
-rw-r--r--games/trackballs/Makefile5
-rw-r--r--games/trigger/Makefile4
-rw-r--r--games/trophy/Makefile4
-rw-r--r--games/ttt/Makefile5
-rw-r--r--games/tux-aqfh/Makefile5
-rw-r--r--games/tuxkart/Makefile4
-rw-r--r--games/tuxtype/Makefile5
-rw-r--r--games/ufoai/Makefile6
-rw-r--r--games/ultimatestunts/Makefile5
-rw-r--r--games/vamos/Makefile5
-rw-r--r--games/vegastrike/Makefile4
-rw-r--r--games/volleyball/Makefile2
-rw-r--r--games/warmux/Makefile4
-rw-r--r--games/warzone2100/Makefile6
-rw-r--r--games/wesnoth/Makefile3
-rw-r--r--games/wmpuzzle/Makefile5
-rw-r--r--games/xbl/Makefile7
-rw-r--r--games/xblast/Makefile5
-rw-r--r--games/xbubble/Makefile4
-rw-r--r--games/xcowsay/Makefile5
-rw-r--r--games/xinvaders/Makefile4
-rw-r--r--games/xmoto/Makefile5
-rw-r--r--games/xpilot-ng-server/Makefile5
-rw-r--r--games/xqf/Makefile5
-rw-r--r--games/xrally/Makefile6
-rw-r--r--games/xsc/Makefile2
-rw-r--r--games/xteddy/Makefile4
-rw-r--r--games/zaz/Makefile4
-rw-r--r--games/zoom/Makefile4
-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
-rw-r--r--irc/bip/Makefile2
-rw-r--r--irc/bitchx/Makefile4
-rw-r--r--irc/bobot++/Makefile5
-rw-r--r--irc/ctrlproxy/Makefile5
-rw-r--r--irc/dcc/Makefile3
-rw-r--r--irc/lostirc/Makefile5
-rw-r--r--irc/miau/Makefile5
-rw-r--r--irc/netwalker-ircc/Makefile2
-rw-r--r--irc/ngircd/Makefile4
-rw-r--r--irc/ratbox-services/Makefile4
-rw-r--r--irc/unreal/Makefile1
-rw-r--r--irc/xchat-fish/Makefile1
-rw-r--r--irc/xchat-gnome/Makefile10
-rw-r--r--irc/xchat/Makefile10
-rw-r--r--irc/xchat1/Makefile4
-rw-r--r--irc/znc/Makefile2
-rw-r--r--japanese/dbskkd-cdb/Makefile2
-rw-r--r--japanese/ebview-gtk2/Makefile4
-rw-r--r--japanese/ebview/Makefile5
-rw-r--r--japanese/emacs-emcws/Makefile1
-rw-r--r--japanese/esecanna-module-wnn6/Makefile4
-rw-r--r--japanese/gicq/Makefile4
-rw-r--r--japanese/gtkicq/Makefile4
-rw-r--r--japanese/im-ja/Makefile5
-rw-r--r--japanese/jmode/Makefile4
-rw-r--r--japanese/kasumi/Makefile5
-rw-r--r--japanese/mecab/Makefile4
-rw-r--r--japanese/mutt-devel/Makefile3
-rw-r--r--japanese/mutt/Makefile2
-rw-r--r--japanese/nethack34/Makefile1
-rw-r--r--japanese/php5-mecab/Makefile4
-rw-r--r--japanese/py-zinnia/Makefile2
-rw-r--r--japanese/quit/Makefile2
-rw-r--r--japanese/rxvt/Makefile4
-rw-r--r--japanese/scim-anthy/Makefile7
-rw-r--r--japanese/scim-canna/Makefile4
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile7
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile7
-rw-r--r--japanese/scim-honoka/Makefile7
-rw-r--r--japanese/scim-prime/Makefile4
-rw-r--r--japanese/scim-skk/Makefile7
-rw-r--r--japanese/scim-tables/Makefile4
-rw-r--r--japanese/scim-tomoe/Makefile7
-rw-r--r--japanese/scim-uim/Makefile7
-rw-r--r--japanese/tcl76/Makefile2
-rw-r--r--japanese/tk80/Makefile4
-rw-r--r--japanese/tomoe/Makefile8
-rw-r--r--japanese/xdvik/Makefile4
-rw-r--r--java/cacao/Makefile4
-rw-r--r--java/classpath/Makefile2
-rw-r--r--java/jamvm/Makefile3
-rw-r--r--java/jc/Makefile4
-rw-r--r--java/sablevm-classpath/Makefile2
-rw-r--r--java/sablevm/Makefile3
-rw-r--r--korean/ami/Makefile4
-rw-r--r--korean/hanterm-xf86/Makefile4
-rw-r--r--korean/ibus-hangul/Makefile4
-rw-r--r--korean/imhangul/Makefile4
-rw-r--r--korean/libhangul/Makefile4
-rw-r--r--korean/nabi/Makefile4
-rw-r--r--korean/scim-hangul/Makefile4
-rw-r--r--lang/clisp/Makefile5
-rw-r--r--lang/ecl/Makefile3
-rw-r--r--lang/elk/Makefile5
-rw-r--r--lang/erlang/Makefile1
-rw-r--r--lang/erlang14/Makefile1
-rw-r--r--lang/ferite/Makefile4
-rw-r--r--lang/gambas2-base/Makefile1
-rw-r--r--lang/gcl/Makefile3
-rw-r--r--lang/gforth/Makefile6
-rw-r--r--lang/ghc/Makefile2
-rw-r--r--lang/gjs/Makefile4
-rw-r--r--lang/intercal/Makefile2
-rw-r--r--lang/klogoturtle/Makefile2
-rw-r--r--lang/libhx/Makefile4
-rw-r--r--lang/librep/Makefile5
-rw-r--r--lang/lush/Makefile4
-rw-r--r--lang/maude/Makefile3
-rw-r--r--lang/mdk/Makefile3
-rw-r--r--lang/moscow_ml/Makefile3
-rw-r--r--lang/nickle/Makefile2
-rw-r--r--lang/ofc/Makefile4
-rw-r--r--lang/oo2c/Makefile4
-rw-r--r--lang/open-cobol-devel/Makefile5
-rw-r--r--lang/open-cobol/Makefile5
-rw-r--r--lang/php52/Makefile4
-rw-r--r--lang/pike76/Makefile1
-rw-r--r--lang/python24/Makefile5
-rw-r--r--lang/python25/Makefile5
-rw-r--r--lang/python26/Makefile9
-rw-r--r--lang/python27/Makefile11
-rw-r--r--lang/python31/Makefile5
-rw-r--r--lang/python32/Makefile5
-rw-r--r--lang/racket-textual/Makefile2
-rw-r--r--lang/racket/Makefile2
-rw-r--r--lang/rexx-imc/Makefile3
-rw-r--r--lang/runawk/Makefile5
-rw-r--r--lang/scsh/Makefile2
-rw-r--r--lang/sdcc-devel/Makefile1
-rw-r--r--lang/sdcc/Makefile1
-rw-r--r--lang/see-devel/Makefile4
-rw-r--r--lang/see/Makefile4
-rw-r--r--lang/smalltalk/Makefile7
-rw-r--r--lang/stklos/Makefile3
-rw-r--r--lang/swi-pl/Makefile2
-rw-r--r--lang/tclX/Makefile4
-rw-r--r--lang/vala/Makefile3
-rw-r--r--mail/abook/Makefile1
-rw-r--r--mail/akpop3d/Makefile2
-rw-r--r--mail/anubis/Makefile4
-rw-r--r--mail/asmail/Makefile1
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/bmf/Makefile6
-rw-r--r--mail/bogofilter/Makefile3
-rw-r--r--mail/claws-mail-address_keeper/Makefile2
-rw-r--r--mail/claws-mail-attach_warner/Makefile2
-rw-r--r--mail/claws-mail-bsfilter/Makefile2
-rw-r--r--mail/claws-mail-clamd/Makefile2
-rw-r--r--mail/claws-mail-fancy/Makefile2
-rw-r--r--mail/claws-mail-gtkhtml2_viewer/Makefile2
-rw-r--r--mail/claws-mail-notification/Makefile2
-rw-r--r--mail/claws-mail-python/Makefile2
-rw-r--r--mail/claws-mail-rssyl/Makefile2
-rw-r--r--mail/claws-mail-spamreport/Makefile2
-rw-r--r--mail/claws-mail-tnef/Makefile4
-rw-r--r--mail/claws-mail-vcalendar/Makefile2
-rw-r--r--mail/claws-mail/Makefile4
-rw-r--r--mail/contact-lookup-applet/Makefile4
-rw-r--r--mail/courier-imap/Makefile10
-rw-r--r--mail/courier/Makefile2
-rw-r--r--mail/cyrus-imapd23/Makefile3
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/dbmail/Makefile2
-rw-r--r--mail/dbmail20/Makefile2
-rw-r--r--mail/dbmail21/Makefile2
-rw-r--r--mail/dbmail22/Makefile2
-rw-r--r--mail/dbmail23/Makefile2
-rw-r--r--mail/dcc-dccd/Makefile1
-rw-r--r--mail/dovecot-sieve/Makefile1
-rw-r--r--mail/dovecot/Makefile4
-rw-r--r--mail/dovecot2-pigeonhole/Makefile1
-rw-r--r--mail/dovecot2/Makefile4
-rw-r--r--mail/dspam/Makefile8
-rw-r--r--mail/elmo-devel/Makefile6
-rw-r--r--mail/elmo/Makefile6
-rw-r--r--mail/esmtp/Makefile5
-rw-r--r--mail/evolution-exchange/Makefile6
-rw-r--r--mail/evolution-mapi/Makefile4
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--mail/faces/Makefile4
-rw-r--r--mail/fetchmail/Makefile2
-rw-r--r--mail/filtermail/Makefile5
-rw-r--r--mail/gmime/Makefile4
-rw-r--r--mail/gmime2/Makefile4
-rw-r--r--mail/gmime24/Makefile4
-rw-r--r--mail/gnubiff/Makefile4
-rw-r--r--mail/heirloom-mailx/Makefile4
-rw-r--r--mail/imapfilter/Makefile4
-rw-r--r--mail/isync/Makefile6
-rw-r--r--mail/kavmilter/Makefile6
-rw-r--r--mail/libesmtp/Makefile4
-rw-r--r--mail/libetpan/Makefile2
-rw-r--r--mail/libmapi/Makefile4
-rw-r--r--mail/libvmime/Makefile2
-rw-r--r--mail/lmtpd/Makefile2
-rw-r--r--mail/lurker/Makefile4
-rw-r--r--mail/mail-notification/Makefile4
-rw-r--r--mail/maildrop/Makefile1
-rw-r--r--mail/mairix/Makefile1
-rw-r--r--mail/mboxgrep/Makefile3
-rw-r--r--mail/milter-greylist/Makefile2
-rw-r--r--mail/mmc/Makefile4
-rw-r--r--mail/mmr/Makefile2
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/perdition/Makefile3
-rw-r--r--mail/pfqueue/Makefile2
-rw-r--r--mail/pop3lite/Makefile4
-rw-r--r--mail/popular/Makefile3
-rw-r--r--mail/postfix-gps/Makefile6
-rw-r--r--mail/qsf/Makefile5
-rw-r--r--mail/rabl_client/Makefile2
-rw-r--r--mail/rabl_server/Makefile2
-rw-r--r--mail/rmilter/Makefile4
-rw-r--r--mail/sccmilter/Makefile7
-rw-r--r--mail/sendmail/bsd.milter.mk7
-rw-r--r--mail/smtpmail/Makefile4
-rw-r--r--mail/spamass-milter/Makefile1
-rw-r--r--mail/spamprobe/Makefile1
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--mail/sylpheed/Makefile6
-rw-r--r--math/GiNaC/Makefile5
-rw-r--r--math/algae/Makefile2
-rw-r--r--math/asymptote/Makefile8
-rw-r--r--math/blas/Makefile2
-rw-r--r--math/cgal/Makefile2
-rw-r--r--math/cln/Makefile6
-rw-r--r--math/dieharder/Makefile1
-rw-r--r--math/drgeo/Makefile4
-rw-r--r--math/eispack/Makefile2
-rw-r--r--math/fftw3/Makefile8
-rw-r--r--math/fityk/Makefile5
-rw-r--r--math/freemat/Makefile2
-rw-r--r--math/fung-calc/Makefile2
-rw-r--r--math/galculator/Makefile4
-rw-r--r--math/gambit/Makefile5
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/geg/Makefile4
-rw-r--r--math/gexpr/Makefile3
-rw-r--r--math/giacxcas/Makefile2
-rw-r--r--math/glpk/Makefile1
-rw-r--r--math/gnumeric/Makefile2
-rw-r--r--math/goblin/Makefile2
-rw-r--r--math/graphthing/Makefile5
-rw-r--r--math/gretl/Makefile3
-rw-r--r--math/guppi/Makefile4
-rw-r--r--math/jags/Makefile1
-rw-r--r--math/labplot/Makefile4
-rw-r--r--math/lapacke/Makefile2
-rw-r--r--math/levmar/Makefile2
-rw-r--r--math/lrng/Makefile2
-rw-r--r--math/msieve/Makefile2
-rw-r--r--math/mtrxmath/Makefile2
-rw-r--r--math/ndiff/Makefile1
-rw-r--r--math/octave-devel/Makefile5
-rw-r--r--math/octave/Makefile5
-rw-r--r--math/oleo/Makefile4
-rw-r--r--math/orpie/Makefile4
-rw-r--r--math/pgcalc/Makefile4
-rw-r--r--math/plplot/Makefile6
-rw-r--r--math/prng/Makefile1
-rw-r--r--math/pspp/Makefile5
-rw-r--r--math/py-numpy/Makefile2
-rw-r--r--math/rpy/Makefile1
-rw-r--r--math/scilab/Makefile3
-rw-r--r--math/sdpa-gmp/Makefile5
-rw-r--r--math/surf/Makefile4
-rw-r--r--math/tablix/Makefile7
-rw-r--r--math/testu01/Makefile1
-rw-r--r--math/unuran/Makefile1
-rw-r--r--math/xspread/Makefile4
-rw-r--r--misc/cdcollect/Makefile3
-rw-r--r--misc/demoniac/Makefile4
-rw-r--r--misc/display/Makefile2
-rw-r--r--misc/findutils/Makefile4
-rw-r--r--misc/getopt/Makefile2
-rw-r--r--misc/gnome-icon-theme-extras/Makefile4
-rw-r--r--misc/gnome-icon-theme/Makefile4
-rw-r--r--misc/gnome-mime-data/Makefile4
-rw-r--r--misc/gnome-osd/Makefile5
-rw-r--r--misc/gregexp/Makefile4
-rw-r--r--misc/gtktalog/Makefile4
-rw-r--r--misc/hello/Makefile2
-rw-r--r--misc/kcd/Makefile4
-rw-r--r--misc/lingoteach/Makefile3
-rw-r--r--misc/linm/Makefile2
-rw-r--r--misc/mc-light/Makefile2
-rw-r--r--misc/mc/Makefile3
-rw-r--r--misc/metalink-tools/Makefile6
-rw-r--r--misc/misterproper/Makefile4
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/podsleuth/Makefile2
-rw-r--r--misc/quick-lounge-applet/Makefile4
-rw-r--r--misc/shared-mime-info/Makefile2
-rw-r--r--misc/terraform/Makefile5
-rw-r--r--misc/toilet/Makefile4
-rw-r--r--misc/uf-view/Makefile4
-rw-r--r--misc/wmcalendar/Makefile4
-rw-r--r--misc/wmpal/Makefile4
-rw-r--r--misc/wmwork/Makefile1
-rw-r--r--misc/xbiso/Makefile4
-rw-r--r--misc/xsw/Makefile4
-rw-r--r--multimedia/aegisub/Makefile2
-rw-r--r--multimedia/audacious-plugins/Makefile5
-rw-r--r--multimedia/audacious/Makefile4
-rw-r--r--multimedia/audiopreview/Makefile4
-rw-r--r--multimedia/avifile/Makefile6
-rw-r--r--multimedia/beep-media-player/Makefile6
-rw-r--r--multimedia/bmp-extra-plugins/Makefile4
-rw-r--r--multimedia/camserv/Makefile6
-rw-r--r--multimedia/cheese/Makefile4
-rw-r--r--multimedia/clutter-gst/Makefile1
-rw-r--r--multimedia/dirac/Makefile4
-rw-r--r--multimedia/dvbsnoop/Makefile2
-rw-r--r--multimedia/dvdauthor/Makefile4
-rw-r--r--multimedia/dvdstyler/Makefile2
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile2
-rw-r--r--multimedia/gavl/Makefile4
-rw-r--r--multimedia/gmencoder/Makefile4
-rw-r--r--multimedia/gmerlin-avdecoder/Makefile5
-rw-r--r--multimedia/gmerlin/Makefile5
-rw-r--r--multimedia/gnome-mplayer/Makefile4
-rw-r--r--multimedia/gnome-subtitles/Makefile4
-rw-r--r--multimedia/gopchop/Makefile5
-rw-r--r--multimedia/gst123/Makefile3
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile7
-rw-r--r--multimedia/gstreamer-plugins/Makefile6
-rw-r--r--multimedia/gstreamer-qt4/Makefile7
-rw-r--r--multimedia/gstreamer/Makefile6
-rw-r--r--multimedia/gtk-recordmydesktop/Makefile4
-rw-r--r--multimedia/gxmms/Makefile6
-rw-r--r--multimedia/kaffeine-mozilla/Makefile2
-rw-r--r--multimedia/kino/Makefile10
-rw-r--r--multimedia/kissdx/Makefile2
-rw-r--r--multimedia/libdv/Makefile8
-rw-r--r--multimedia/libdvdplay/Makefile2
-rw-r--r--multimedia/libmpeg3/Makefile4
-rw-r--r--multimedia/libquicktime/Makefile4
-rw-r--r--multimedia/libtheora/Makefile6
-rw-r--r--multimedia/libva/Makefile1
-rw-r--r--multimedia/libxine/Makefile8
-rw-r--r--multimedia/lives/Makefile5
-rw-r--r--multimedia/lsdvd/Makefile3
-rw-r--r--multimedia/lxdvdrip/Makefile1
-rw-r--r--multimedia/miro/Makefile2
-rw-r--r--multimedia/mjpegtools/Makefile7
-rw-r--r--multimedia/mkvtoolnix/Makefile3
-rw-r--r--multimedia/moonlight/Makefile4
-rw-r--r--multimedia/mp4split/Makefile4
-rw-r--r--multimedia/mpeg4ip/Makefile4
-rw-r--r--multimedia/mythtv-frontend/Makefile3
-rw-r--r--multimedia/mythtv/Makefile3
-rw-r--r--multimedia/oggvideotools/Makefile2
-rw-r--r--multimedia/ogmrip/Makefile5
-rw-r--r--multimedia/pitivi/Makefile4
-rw-r--r--multimedia/py-gstreamer/Makefile4
-rw-r--r--multimedia/py-kaa-metadata/Makefile1
-rw-r--r--multimedia/quark/Makefile4
-rw-r--r--multimedia/recmpeg/Makefile5
-rw-r--r--multimedia/rtmpdump/Makefile3
-rw-r--r--multimedia/sabbu/Makefile1
-rw-r--r--multimedia/smpeg/Makefile2
-rw-r--r--multimedia/spook/Makefile3
-rw-r--r--multimedia/subtitleeditor/Makefile5
-rw-r--r--multimedia/swfdec-gnome/Makefile4
-rw-r--r--multimedia/totem-pl-parser/Makefile4
-rw-r--r--multimedia/totem/Makefile4
-rw-r--r--multimedia/transcode/Makefile4
-rw-r--r--multimedia/vamps/Makefile1
-rw-r--r--multimedia/vcdimager/Makefile4
-rw-r--r--multimedia/vdpau-video/Makefile1
-rw-r--r--multimedia/vlc/Makefile5
-rw-r--r--multimedia/w_scan/Makefile1
-rw-r--r--multimedia/xawtv/Makefile4
-rw-r--r--multimedia/xbmc/Makefile4
-rw-r--r--multimedia/xfce4-parole/Makefile6
-rw-r--r--multimedia/xine/Makefile6
-rw-r--r--multimedia/xmms-status-plugin/Makefile4
-rw-r--r--multimedia/xmms/Makefile4
-rw-r--r--multimedia/xtheater/Makefile5
-rw-r--r--net-im/ayttm/Makefile5
-rw-r--r--net-im/centericq/Makefile4
-rw-r--r--net-im/centerim/Makefile4
-rw-r--r--net-im/cli-msn/Makefile1
-rw-r--r--net-im/climm/Makefile1
-rw-r--r--net-im/empathy/Makefile4
-rw-r--r--net-im/farsight2/Makefile4
-rw-r--r--net-im/folks/Makefile4
-rw-r--r--net-im/freetalk/Makefile4
-rw-r--r--net-im/fugu/Makefile2
-rw-r--r--net-im/gajim-devel/Makefile5
-rw-r--r--net-im/gajim/Makefile5
-rw-r--r--net-im/gale/Makefile1
-rw-r--r--net-im/gicq/Makefile4
-rw-r--r--net-im/gloox/Makefile4
-rw-r--r--net-im/gossip/Makefile4
-rw-r--r--net-im/gyach/Makefile4
-rw-r--r--net-im/ickle/Makefile2
-rw-r--r--net-im/jabber/Makefile1
-rw-r--r--net-im/jggtrans/Makefile5
-rw-r--r--net-im/kmerlin/Makefile2
-rw-r--r--net-im/komclean/Makefile1
-rw-r--r--net-im/libjingle/Makefile23
-rw-r--r--net-im/libnice/Makefile4
-rw-r--r--net-im/libpurple/Makefile4
-rw-r--r--net-im/loudmouth/Makefile4
-rw-r--r--net-im/mcabber/Makefile3
-rw-r--r--net-im/meanwhile/Makefile4
-rw-r--r--net-im/pidgin-birthday-reminder/Makefile4
-rw-r--r--net-im/pidgin-fetion/Makefile4
-rw-r--r--net-im/pidgin-guifications/Makefile3
-rw-r--r--net-im/pidgin-libnotify/Makefile4
-rw-r--r--net-im/telepathy-farsight/Makefile4
-rw-r--r--net-im/telepathy-gabble/Makefile2
-rw-r--r--net-im/telepathy-haze/Makefile2
-rw-r--r--net-im/telepathy-idle/Makefile3
-rw-r--r--net-im/telepathy-mission-control/Makefile3
-rw-r--r--net-im/telepathy-python/Makefile4
-rw-r--r--net-im/telepathy-salut/Makefile4
-rw-r--r--net-im/vqcc-gtk/Makefile5
-rw-r--r--net-im/ysm/Makefile5
-rw-r--r--net-im/zephyr/Makefile1
-rw-r--r--net-mgmt/ap-utils/Makefile6
-rw-r--r--net-mgmt/cacti-spine/Makefile4
-rw-r--r--net-mgmt/collectd/Makefile5
-rw-r--r--net-mgmt/collectd5/Makefile5
-rw-r--r--net-mgmt/disco/Makefile4
-rw-r--r--net-mgmt/etherape/Makefile4
-rw-r--r--net-mgmt/ettercap/Makefile3
-rw-r--r--net-mgmt/icinga/Makefile7
-rw-r--r--net-mgmt/kismet/Makefile1
-rw-r--r--net-mgmt/mbrowse/Makefile4
-rw-r--r--net-mgmt/nagios-devel/Makefile7
-rw-r--r--net-mgmt/nagios-plugins/Makefile8
-rw-r--r--net-mgmt/nagios-snmp-plugins/Makefile2
-rw-r--r--net-mgmt/nagios/Makefile5
-rw-r--r--net-mgmt/nagios2/Makefile7
-rw-r--r--net-mgmt/nbtscan/Makefile4
-rw-r--r--net-mgmt/nefu/Makefile4
-rw-r--r--net-mgmt/nettop/Makefile2
-rw-r--r--net-mgmt/packit/Makefile2
-rw-r--r--net-mgmt/pmacct/Makefile4
-rw-r--r--net-mgmt/py-yapsnmp/Makefile6
-rw-r--r--net-mgmt/satellite/Makefile20
-rw-r--r--net-mgmt/sblim-wbemcli/Makefile3
-rw-r--r--net-mgmt/sing/Makefile5
-rw-r--r--net-mgmt/snmp4nagios/Makefile6
-rw-r--r--net-mgmt/spectools/Makefile4
-rw-r--r--net-mgmt/zabbix-server/Makefile3
-rw-r--r--net-mgmt/zabbix2-server/Makefile3
-rw-r--r--net-p2p/amule-devel/Makefile3
-rw-r--r--net-p2p/amule/Makefile3
-rw-r--r--net-p2p/dctc-gui-qt/Makefile2
-rw-r--r--net-p2p/dctc/Makefile2
-rw-r--r--net-p2p/fidelio/Makefile4
-rw-r--r--net-p2p/gift/Makefile2
-rw-r--r--net-p2p/giftoxic/Makefile4
-rw-r--r--net-p2p/gnunet/Makefile5
-rw-r--r--net-p2p/gtkhx/Makefile4
-rw-r--r--net-p2p/gtorrentviewer/Makefile4
-rw-r--r--net-p2p/jigdo/Makefile6
-rw-r--r--net-p2p/libbt/Makefile3
-rw-r--r--net-p2p/libtorrent-rasterbar-14/Makefile5
-rw-r--r--net-p2p/libtorrent-rasterbar-15/Makefile1
-rw-r--r--net-p2p/lopster/Makefile4
-rw-r--r--net-p2p/mldonkey/Makefile10
-rw-r--r--net-p2p/moodriver/Makefile4
-rw-r--r--net-p2p/mooseekd/Makefile4
-rw-r--r--net-p2p/opendchub/Makefile5
-rw-r--r--net-p2p/qtorrent/Makefile6
-rw-r--r--net-p2p/rtorrent/Makefile2
-rw-r--r--net-p2p/teknap/Makefile4
-rw-r--r--net-p2p/transmission-cli/Makefile4
-rw-r--r--net-p2p/valknut/Makefile2
-rw-r--r--net-p2p/verlihub-plugins-luascript/Makefile6
-rw-r--r--net/DarwinStreamingServer/Makefile2
-rw-r--r--net/arping/Makefile8
-rw-r--r--net/asterisk/Makefile5
-rw-r--r--net/asterisk10/Makefile5
-rw-r--r--net/asterisk14/Makefile6
-rw-r--r--net/asterisk16/Makefile5
-rw-r--r--net/avahi-app/Makefile6
-rw-r--r--net/bfilter/Makefile4
-rw-r--r--net/bmon/Makefile3
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/c3270/Makefile6
-rw-r--r--net/clamz/Makefile4
-rw-r--r--net/csync2/Makefile6
-rw-r--r--net/ct/Makefile2
-rw-r--r--net/dante/Makefile4
-rw-r--r--net/daq/Makefile1
-rw-r--r--net/dictd/Makefile4
-rw-r--r--net/easysoap/Makefile4
-rw-r--r--net/ekiga/Makefile5
-rw-r--r--net/fonulator/Makefile5
-rw-r--r--net/freerdp/Makefile5
-rw-r--r--net/freeswitch-core/Makefile4
-rw-r--r--net/freewais-sf/Makefile2
-rw-r--r--net/g2ipmsg/Makefile2
-rw-r--r--net/gini/Makefile3
-rw-r--r--net/glib-networking/Makefile4
-rw-r--r--net/gnome-mud/Makefile4
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/gnu-dico/Makefile4
-rw-r--r--net/gq/Makefile5
-rw-r--r--net/grdesktop/Makefile3
-rw-r--r--net/grsync/Makefile1
-rw-r--r--net/gtk-vnc/Makefile4
-rw-r--r--net/gutenfetch/Makefile4
-rw-r--r--net/hawknl-devel/Makefile5
-rw-r--r--net/hawknl/Makefile5
-rw-r--r--net/howl/Makefile1
-rw-r--r--net/iaxmodem/Makefile4
-rw-r--r--net/iplog/Makefile5
-rw-r--r--net/jwhois/Makefile3
-rw-r--r--net/kdenetwork3/Makefile2
-rw-r--r--net/keepalived/Makefile1
-rw-r--r--net/kphone/Makefile2
-rw-r--r--net/krdesktop/Makefile2
-rw-r--r--net/libfb/Makefile5
-rw-r--r--net/libgnetwork/Makefile4
-rw-r--r--net/libgweather/Makefile4
-rw-r--r--net/libmms/Makefile2
-rw-r--r--net/libpcap/Makefile1
-rw-r--r--net/librsync/Makefile2
-rw-r--r--net/libtrace/Makefile2
-rw-r--r--net/libvncserver/Makefile4
-rw-r--r--net/liferea/Makefile4
-rw-r--r--net/linc/Makefile4
-rw-r--r--net/link-monitor-applet/Makefile3
-rw-r--r--net/linneighborhood/Makefile6
-rw-r--r--net/linphone-base/Makefile5
-rw-r--r--net/mediatomb/Makefile4
-rw-r--r--net/minisapserver/Makefile2
-rw-r--r--net/miredo/Makefile2
-rw-r--r--net/mpich2/Makefile5
-rw-r--r--net/nc6/Makefile4
-rw-r--r--net/net6/Makefile5
-rw-r--r--net/netboot/Makefile4
-rw-r--r--net/netspeed_applet/Makefile4
-rw-r--r--net/nss-pam-ldapd/Makefile4
-rw-r--r--net/nss_ldap/Makefile4
-rw-r--r--net/ntop/Makefile4
-rw-r--r--net/opal/Makefile4
-rw-r--r--net/opal3/Makefile4
-rw-r--r--net/openh323/Makefile5
-rw-r--r--net/openldap23-server/Makefile4
-rw-r--r--net/openldap24-server/Makefile4
-rw-r--r--net/panoptis/Makefile1
-rw-r--r--net/pktanon/Makefile3
-rw-r--r--net/poptop/Makefile1
-rw-r--r--net/proxy-suite/Makefile2
-rw-r--r--net/quagga/Makefile4
-rw-r--r--net/rabbitmq-c-devel/Makefile2
-rw-r--r--net/rabbitmq-c/Makefile2
-rw-r--r--net/remmina-applet/Makefile4
-rw-r--r--net/remmina-plugins/bsd.plugin.mk3
-rw-r--r--net/remmina/Makefile3
-rw-r--r--net/rexx-sock/Makefile3
-rw-r--r--net/rsync/Makefile6
-rw-r--r--net/rtpproxy/Makefile4
-rw-r--r--net/samba34/Makefile1
-rw-r--r--net/samba35/Makefile3
-rw-r--r--net/samba4-devel/Makefile1
-rw-r--r--net/ser/Makefile2
-rw-r--r--net/serveez/Makefile5
-rw-r--r--net/silc-client/Makefile2
-rw-r--r--net/silc-server/Makefile2
-rw-r--r--net/sobby/Makefile5
-rw-r--r--net/tapidbus/Makefile1
-rw-r--r--net/tintin++/Makefile2
-rw-r--r--net/trafshow3/Makefile3
-rw-r--r--net/trickle/Makefile4
-rw-r--r--net/tridiavnc/Makefile2
-rw-r--r--net/tsclient/Makefile6
-rw-r--r--net/twinkle/Makefile3
-rw-r--r--net/ulxmlrpcpp/Makefile7
-rw-r--r--net/uplog/Makefile4
-rw-r--r--net/ushare/Makefile2
-rw-r--r--net/vde/Makefile1
-rw-r--r--net/vinagre/Makefile2
-rw-r--r--net/vino/Makefile4
-rw-r--r--net/whois/Makefile1
-rw-r--r--net/wire/Makefile3
-rw-r--r--net/wmwifi/Makefile2
-rw-r--r--net/wol/Makefile5
-rw-r--r--net/x11vnc/Makefile2
-rw-r--r--net/xipdump/Makefile2
-rw-r--r--net/xmlrpc-epi/Makefile4
-rw-r--r--net/xrdp/Makefile5
-rw-r--r--net/yate-devel/Makefile4
-rw-r--r--net/yate/Makefile6
-rw-r--r--news/grn/Makefile7
-rw-r--r--news/klibido/Makefile6
-rw-r--r--news/newscache/Makefile4
-rw-r--r--news/newsstar/Makefile4
-rw-r--r--news/newsx/Makefile2
-rw-r--r--news/nntpcache/Makefile1
-rw-r--r--news/noffle/Makefile4
-rw-r--r--news/nzbget/Makefile7
-rw-r--r--news/pan/Makefile2
-rw-r--r--news/s-news/Makefile4
-rw-r--r--news/suck/Makefile1
-rw-r--r--news/tin/Makefile2
-rw-r--r--news/yencode/Makefile5
-rw-r--r--palm/gnome-pilot-conduits/Makefile4
-rw-r--r--palm/gnome-pilot/Makefile4
-rw-r--r--palm/jpilot-picsnvideos/Makefile2
-rw-r--r--palm/jpilot/Makefile2
-rw-r--r--palm/pilot-link/Makefile3
-rw-r--r--palm/ppmtoTbmp/Makefile2
-rw-r--r--palm/synce-gvfs/Makefile2
-rw-r--r--palm/synce-trayicon/Makefile2
-rw-r--r--polish/ekg/Makefile6
-rw-r--r--polish/ekg2/Makefile2
-rw-r--r--polish/gnugadu2/Makefile4
-rw-r--r--polish/tleenx2/Makefile3
-rw-r--r--ports-mgmt/gnome-packagekit/Makefile4
-rw-r--r--ports-mgmt/kpackagekit/Makefile2
-rw-r--r--ports-mgmt/packagekit/Makefile6
-rw-r--r--ports-mgmt/portdowngrade/Makefile4
-rw-r--r--print/catdvi/Makefile5
-rw-r--r--print/cjk-lyx/Makefile4
-rw-r--r--print/cups-base/Makefile6
-rw-r--r--print/cups-bjnp/Makefile4
-rw-r--r--print/cups-pk-helper/Makefile3
-rw-r--r--print/cups-pstoraster/Makefile4
-rw-r--r--print/fontforge/Makefile3
-rw-r--r--print/foomatic-filters/Makefile7
-rw-r--r--print/gfontview/Makefile8
-rw-r--r--print/ggv/Makefile4
-rw-r--r--print/ghostscript7/Makefile7
-rw-r--r--print/ghostscript8/Makefile6
-rw-r--r--print/ghostscript9/Makefile6
-rw-r--r--print/gnome-cups-manager/Makefile4
-rw-r--r--print/gnome-print/Makefile4
-rw-r--r--print/gtklp/Makefile1
-rw-r--r--print/gutenprint-base/Makefile5
-rw-r--r--print/hp2xx/Makefile6
-rw-r--r--print/hpijs/Makefile4
-rw-r--r--print/hplip/Makefile1
-rw-r--r--print/libgnomecups/Makefile4
-rw-r--r--print/libgnomeprint/Makefile4
-rw-r--r--print/libotf/Makefile2
-rw-r--r--print/libspectre/Makefile3
-rw-r--r--print/lyx/Makefile4
-rw-r--r--print/lyx14/Makefile2
-rw-r--r--print/lyx16/Makefile4
-rw-r--r--print/panda/Makefile5
-rw-r--r--print/pips800/Makefile.pips5
-rw-r--r--print/pslib/Makefile4
-rw-r--r--print/py-cups/Makefile1
-rw-r--r--print/system-config-printer/Makefile3
-rw-r--r--print/teTeX-base/Makefile4
-rw-r--r--print/texinfo/Makefile4
-rw-r--r--print/trueprint/Makefile2
-rw-r--r--print/ttf2pt1/Makefile4
-rw-r--r--print/ttftot42/Makefile5
-rw-r--r--print/wprint/Makefile5
-rw-r--r--print/xdvik/Makefile4
-rw-r--r--russian/apache13-modssl/Makefile3
-rw-r--r--russian/ksocrat/Makefile2
-rw-r--r--science/cdo/Makefile1
-rw-r--r--science/chemical-mime-data/Makefile3
-rw-r--r--science/chemtool/Makefile2
-rw-r--r--science/flounder/Makefile4
-rw-r--r--science/gchemutils/Makefile3
-rw-r--r--science/ghemical/Makefile6
-rw-r--r--science/gnudatalanguage/Makefile6
-rw-r--r--science/gromacs/Makefile3
-rw-r--r--science/gsmc/Makefile4
-rw-r--r--science/gwyddion/Makefile4
-rw-r--r--science/harminv/Makefile2
-rw-r--r--science/libkml/Makefile1
-rw-r--r--science/liboglappth/Makefile8
-rw-r--r--science/linsmith/Makefile5
-rw-r--r--science/mbdyn/Makefile1
-rw-r--r--science/meep/Makefile2
-rw-r--r--science/minc/Makefile4
-rw-r--r--science/minc2/Makefile4
-rw-r--r--science/mpb/Makefile4
-rw-r--r--science/netcdf4/Makefile1
-rw-r--r--science/peekabot/Makefile4
-rw-r--r--science/py-mlpy/Makefile1
-rw-r--r--science/pycdf/Makefile2
-rw-r--r--science/silo/Makefile4
-rw-r--r--science/udunits/Makefile4
-rw-r--r--science/v_sim/Makefile4
-rw-r--r--science/vis5d+/Makefile6
-rw-r--r--security/aide/Makefile4
-rw-r--r--security/authforce/Makefile3
-rw-r--r--security/barnyard2/Makefile1
-rw-r--r--security/bcrypt/Makefile1
-rw-r--r--security/bioapi/Makefile2
-rw-r--r--security/bro/Makefile4
-rw-r--r--security/clamav-devel/Makefile2
-rw-r--r--security/clamav/Makefile2
-rw-r--r--security/courier-authlib/Makefile2
-rw-r--r--security/courierpassd/Makefile1
-rw-r--r--security/courierpasswd/Makefile1
-rw-r--r--security/courieruserinfo/Makefile1
-rw-r--r--security/crank/Makefile4
-rw-r--r--security/cyrus-sasl2/Makefile1
-rw-r--r--security/dirmngr/Makefile2
-rw-r--r--security/dropbear/Makefile2
-rw-r--r--security/firewalk/Makefile4
-rw-r--r--security/fpm/Makefile4
-rw-r--r--security/fprint_demo/Makefile4
-rw-r--r--security/fwbuilder-devel/Makefile6
-rw-r--r--security/fwbuilder/Makefile6
-rw-r--r--security/gnome-keyring/Makefile4
-rw-r--r--security/gnutls-devel/Makefile2
-rw-r--r--security/gnutls/Makefile2
-rw-r--r--security/gpa/Makefile3
-rw-r--r--security/gpass/Makefile2
-rw-r--r--security/gringotts/Makefile5
-rw-r--r--security/gsasl/Makefile5
-rw-r--r--security/gss/Makefile5
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/krb5-appl/Makefile3
-rw-r--r--security/libecc/Makefile4
-rw-r--r--security/libfprint/Makefile4
-rw-r--r--security/libfwbuilder-devel/Makefile6
-rw-r--r--security/libgnome-keyring/Makefile4
-rw-r--r--security/libgnomesu/Makefile4
-rw-r--r--security/libgringotts/Makefile3
-rw-r--r--security/lsh/Makefile3
-rw-r--r--security/mcrypt/Makefile4
-rw-r--r--security/nmap/Makefile2
-rw-r--r--security/opencryptoki/Makefile2
-rw-r--r--security/openscep/Makefile3
-rw-r--r--security/openssl_tpm_engine/Makefile2
-rw-r--r--security/openvas-libraries/Makefile.common1
-rw-r--r--security/openvpn-admin/Makefile4
-rw-r--r--security/osslsigncode/Makefile5
-rw-r--r--security/pam_authsrv/Makefile4
-rw-r--r--security/pam_krb5/Makefile1
-rw-r--r--security/pamtester/Makefile22
-rw-r--r--security/parano/Makefile4
-rw-r--r--security/pecl-gnupg/Makefile2
-rw-r--r--security/pecl-ssh2/Makefile4
-rw-r--r--security/pidgin-encryption/Makefile4
-rw-r--r--security/pidgin-otr/Makefile4
-rw-r--r--security/pinentry/Makefile1
-rw-r--r--security/pks/Makefile3
-rw-r--r--security/prelude-manager/Makefile4
-rw-r--r--security/py-bcrypt/Makefile2
-rw-r--r--security/py-crack/Makefile11
-rw-r--r--security/py-mhash/Makefile2
-rw-r--r--security/revelation/Makefile3
-rw-r--r--security/seahorse-plugins/Makefile4
-rw-r--r--security/seahorse/Makefile4
-rw-r--r--security/shishi/Makefile7
-rw-r--r--security/snort/Makefile1
-rw-r--r--security/snort_inline/Makefile1
-rw-r--r--security/spass/Makefile1
-rw-r--r--security/spybye/Makefile1
-rw-r--r--security/squidclamav/Makefile3
-rw-r--r--security/steghide/Makefile4
-rw-r--r--security/stunnel/Makefile4
-rw-r--r--security/sudo/Makefile4
-rw-r--r--security/sudosh/Makefile2
-rw-r--r--security/sudosh2/Makefile2
-rw-r--r--security/sudosh3/Makefile2
-rw-r--r--security/tinc/Makefile1
-rw-r--r--security/tor-devel/Makefile3
-rw-r--r--security/tor/Makefile3
-rw-r--r--security/tpm-tools/Makefile2
-rw-r--r--security/tuntun/Makefile4
-rw-r--r--security/vpnc/Makefile2
-rw-r--r--security/yafic/Makefile2
-rw-r--r--security/yapet/Makefile2
-rw-r--r--security/yara/Makefile1
-rw-r--r--security/zebedee/Makefile2
-rw-r--r--shells/bash/Makefile4
-rw-r--r--shells/fish/Makefile3
-rw-r--r--shells/flash/Makefile4
-rw-r--r--shells/zsh/Makefile4
-rw-r--r--sysutils/LPRng/Makefile4
-rw-r--r--sysutils/afflib/Makefile4
-rw-r--r--sysutils/apcupsd/Makefile6
-rw-r--r--sysutils/apt/Makefile1
-rw-r--r--sysutils/ascpu/Makefile2
-rw-r--r--sysutils/avfs/Makefile2
-rw-r--r--sysutils/bacula-server/Makefile4
-rw-r--r--sysutils/bacula2-server/Makefile6
-rw-r--r--sysutils/battfink/Makefile4
-rw-r--r--sysutils/brasero/Makefile4
-rw-r--r--sysutils/bubblemon2/Makefile4
-rw-r--r--sysutils/cdrkit/Makefile2
-rw-r--r--sysutils/cog/Makefile4
-rw-r--r--sysutils/conky/Makefile2
-rw-r--r--sysutils/consolekit/Makefile4
-rw-r--r--sysutils/cpu/Makefile2
-rw-r--r--sysutils/dar/Makefile3
-rw-r--r--sysutils/dc3dd/Makefile4
-rw-r--r--sysutils/di/Makefile2
-rw-r--r--sysutils/dircomp/Makefile3
-rw-r--r--sysutils/dmidecode/Makefile2
-rw-r--r--sysutils/duff/Makefile1
-rw-r--r--sysutils/dupmerge/Makefile1
-rw-r--r--sysutils/dvdbackup/Makefile1
-rw-r--r--sysutils/eiciel/Makefile4
-rw-r--r--sysutils/fileschanged/Makefile5
-rw-r--r--sysutils/freeipmi/Makefile2
-rw-r--r--sysutils/fusefs-chironfs/Makefile3
-rw-r--r--sysutils/fusefs-encfs/Makefile3
-rw-r--r--sysutils/fusefs-funionfs/Makefile4
-rw-r--r--sysutils/fusefs-fur/Makefile2
-rw-r--r--sysutils/fusefs-libs/Makefile4
-rw-r--r--sysutils/fusefs-ntfs/Makefile4
-rw-r--r--sysutils/fusefs-smbnetfs/Makefile2
-rw-r--r--sysutils/fusefs-sshfs/Makefile2
-rw-r--r--sysutils/ganglia-monitor-core/Makefile2
-rw-r--r--sysutils/gcombust/Makefile4
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gkleds2/Makefile4
-rw-r--r--sysutils/gksu/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile4
-rw-r--r--sysutils/gnome-device-manager/Makefile4
-rw-r--r--sysutils/gnome-mount/Makefile4
-rw-r--r--sysutils/gnome-pkgview/Makefile4
-rw-r--r--sysutils/gnome-power-manager/Makefile4
-rw-r--r--sysutils/gnome-settings-daemon/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnome-system-tools/Makefile4
-rw-r--r--sysutils/gnomebaker/Makefile4
-rw-r--r--sysutils/goaccess/Makefile2
-rw-r--r--sysutils/graveman/Makefile4
-rw-r--r--sysutils/gtk-imonc/Makefile4
-rw-r--r--sysutils/gupsc/Makefile4
-rw-r--r--sysutils/hal-info/Makefile4
-rw-r--r--sysutils/hal/Makefile6
-rw-r--r--sysutils/heartbeat/Makefile4
-rw-r--r--sysutils/hoz/Makefile2
-rw-r--r--sysutils/iextract/Makefile3
-rw-r--r--sysutils/ipmitool/Makefile1
-rw-r--r--sysutils/lavaps/Makefile2
-rw-r--r--sysutils/ldapvi/Makefile3
-rw-r--r--sysutils/less/Makefile2
-rw-r--r--sysutils/libcdio/Makefile3
-rw-r--r--sysutils/libgksu/Makefile4
-rw-r--r--sysutils/lineak-defaultplugin/Makefile4
-rw-r--r--sysutils/lineak-kdeplugins/Makefile4
-rw-r--r--sysutils/lineak-xosdplugin/Makefile4
-rw-r--r--sysutils/lineakd/Makefile4
-rw-r--r--sysutils/logtool/Makefile1
-rw-r--r--sysutils/lxinput/Makefile1
-rw-r--r--sysutils/lxtask/Makefile1
-rw-r--r--sysutils/lxterminal/Makefile1
-rw-r--r--sysutils/memfetch/Makefile1
-rw-r--r--sysutils/metalog/Makefile1
-rw-r--r--sysutils/monit/Makefile2
-rw-r--r--sysutils/mount.app/Makefile2
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/ntfsprogs/Makefile3
-rw-r--r--sysutils/openipmi/Makefile1
-rw-r--r--sysutils/pefs-kmod/Makefile2
-rw-r--r--sysutils/pessulus/Makefile4
-rw-r--r--sysutils/policykit-gnome/Makefile4
-rw-r--r--sysutils/policykit/Makefile6
-rw-r--r--sysutils/polkit-gnome/Makefile4
-rw-r--r--sysutils/polkit-qt/Makefile2
-rw-r--r--sysutils/polkit/Makefile6
-rw-r--r--sysutils/powerman/Makefile5
-rw-r--r--sysutils/progsreiserfs/Makefile3
-rw-r--r--sysutils/pwgen/Makefile2
-rw-r--r--sysutils/pyrenamer/Makefile4
-rw-r--r--sysutils/quicksynergy/Makefile4
-rw-r--r--sysutils/radeontool/Makefile2
-rw-r--r--sysutils/rdup/Makefile2
-rw-r--r--sysutils/rsyslog3/bsd.rsyslog.mk1
-rw-r--r--sysutils/rsyslog4-devel/Makefile1
-rw-r--r--sysutils/rsyslog4/Makefile1
-rw-r--r--sysutils/rsyslog5/Makefile1
-rw-r--r--sysutils/rsyslog6-devel/Makefile5
-rw-r--r--sysutils/scanbuttond/Makefile4
-rw-r--r--sysutils/sensors-applet/Makefile4
-rw-r--r--sysutils/slmon/Makefile5
-rw-r--r--sysutils/synergy/Makefile2
-rw-r--r--sysutils/syslog-ng-devel/Makefile4
-rw-r--r--sysutils/syslog-ng2/Makefile4
-rw-r--r--sysutils/syslog-ng3-devel/Makefile4
-rw-r--r--sysutils/syslog-ng3/Makefile4
-rw-r--r--sysutils/system-tools-backends/Makefile4
-rw-r--r--sysutils/testdisk/Makefile3
-rw-r--r--sysutils/tmux/Makefile2
-rw-r--r--sysutils/torsmo/Makefile2
-rw-r--r--sysutils/tracker-client/Makefile4
-rw-r--r--sysutils/tss/Makefile2
-rw-r--r--sysutils/udfclient/Makefile2
-rw-r--r--sysutils/unieject/Makefile6
-rw-r--r--sysutils/uniutils/Makefile6
-rw-r--r--sysutils/upower/Makefile6
-rw-r--r--sysutils/usbhotkey/Makefile14
-rw-r--r--sysutils/usbutils/Makefile4
-rw-r--r--sysutils/vstrip/Makefile1
-rw-r--r--sysutils/wmfire/Makefile4
-rw-r--r--sysutils/xfsprogs/Makefile1
-rw-r--r--sysutils/xlogmaster/Makefile5
-rw-r--r--sysutils/xsu/Makefile4
-rw-r--r--sysutils/xvidcap/Makefile4
-rw-r--r--textproc/apertium/Makefile4
-rw-r--r--textproc/artha/Makefile4
-rw-r--r--textproc/aspell/Makefile4
-rw-r--r--textproc/cost/Makefile3
-rw-r--r--textproc/dict/Makefile4
-rw-r--r--textproc/dictfmt/Makefile1
-rw-r--r--textproc/diffmark/Makefile1
-rw-r--r--textproc/domc/Makefile2
-rw-r--r--textproc/dwdiff/Makefile2
-rw-r--r--textproc/ekhtml/Makefile4
-rw-r--r--textproc/enchant/Makefile4
-rw-r--r--textproc/estraier/Makefile4
-rw-r--r--textproc/exempi/Makefile6
-rw-r--r--textproc/gdome2/Makefile4
-rw-r--r--textproc/glimpse/Makefile2
-rw-r--r--textproc/gmetadom/Makefile4
-rw-r--r--textproc/gnome-doc-utils/Makefile4
-rw-r--r--textproc/gnome-spell/Makefile4
-rw-r--r--textproc/gnome-translate/Makefile4
-rw-r--r--textproc/gnugrep/Makefile1
-rw-r--r--textproc/gtkdiff/Makefile4
-rw-r--r--textproc/gtkspell/Makefile4
-rw-r--r--textproc/hyperestraier/Makefile4
-rw-r--r--textproc/ibus-kmfl/Makefile1
-rw-r--r--textproc/ibus/Makefile2
-rw-r--r--textproc/iksemel/Makefile4
-rw-r--r--textproc/ipdf/Makefile4
-rw-r--r--textproc/kbedic/Makefile3
-rw-r--r--textproc/kmflcomp/Makefile1
-rw-r--r--textproc/libextractor/Makefile6
-rw-r--r--textproc/libkmfl/Makefile1
-rw-r--r--textproc/liblrdf/Makefile5
-rw-r--r--textproc/libmrss/Makefile1
-rw-r--r--textproc/libnxml/Makefile3
-rw-r--r--textproc/libparsifal/Makefile4
-rw-r--r--textproc/libtranslate/Makefile5
-rw-r--r--textproc/libtre/Makefile6
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/libxode/Makefile4
-rw-r--r--textproc/libxslt/Makefile4
-rw-r--r--textproc/link-grammar/Makefile4
-rw-r--r--textproc/ltxml/Makefile1
-rw-r--r--textproc/mifluz/Makefile5
-rw-r--r--textproc/modlogan/Makefile3
-rw-r--r--textproc/msort/Makefile5
-rw-r--r--textproc/openjade/Makefile3
-rw-r--r--textproc/opensp/Makefile4
-rw-r--r--textproc/ots/Makefile1
-rw-r--r--textproc/pecl-ctemplate/Makefile4
-rw-r--r--textproc/pecl-xdiff/Makefile1
-rw-r--r--textproc/py-enchant/Makefile2
-rw-r--r--textproc/py-hyperestraier/Makefile1
-rw-r--r--textproc/rarian/Makefile4
-rw-r--r--textproc/rasqal/Makefile5
-rw-r--r--textproc/rast/Makefile3
-rw-r--r--textproc/redland/Makefile5
-rw-r--r--textproc/sablotron/Makefile5
-rw-r--r--textproc/sagasu/Makefile4
-rw-r--r--textproc/scew/Makefile4
-rw-r--r--textproc/scim-input-pad/Makefile4
-rw-r--r--textproc/scim-kmfl-imengine/Makefile1
-rw-r--r--textproc/scim-openvanilla/Makefile4
-rw-r--r--textproc/scim-table-imengine/Makefile6
-rw-r--r--textproc/scim/Makefile4
-rw-r--r--textproc/scrollkeeper/Makefile4
-rw-r--r--textproc/sdcv/Makefile1
-rw-r--r--textproc/senna/Makefile2
-rw-r--r--textproc/skim/Makefile7
-rw-r--r--textproc/soothsayer/Makefile7
-rw-r--r--textproc/source-highlight/Makefile1
-rw-r--r--textproc/spellutils/Makefile6
-rw-r--r--textproc/sphinxsearch-devel/Makefile2
-rw-r--r--textproc/sphinxsearch/Makefile2
-rw-r--r--textproc/stardict2/Makefile4
-rw-r--r--textproc/teckit/Makefile4
-rw-r--r--textproc/uim-el/Makefile3
-rw-r--r--textproc/uim-gnome/Makefile4
-rw-r--r--textproc/uim-kde/Makefile9
-rw-r--r--textproc/uim-kde4/Makefile8
-rw-r--r--textproc/uim-qt/Makefile8
-rw-r--r--textproc/uim-qt4/Makefile8
-rw-r--r--textproc/uim/Makefile6
-rw-r--r--textproc/unrtf/Makefile1
-rw-r--r--textproc/webcpp/Makefile3
-rw-r--r--textproc/wv/Makefile2
-rw-r--r--textproc/xalan-c/Makefile3
-rw-r--r--textproc/xls2xml/Makefile4
-rw-r--r--textproc/xmlroff/Makefile4
-rw-r--r--textproc/xqilla/Makefile2
-rw-r--r--www/apache13+ipv6/Makefile4
-rw-r--r--www/apache13-modperl/Makefile2
-rw-r--r--www/apache13-modssl/Makefile4
-rw-r--r--www/apache13/Makefile4
-rw-r--r--www/apache20/Makefile3
-rw-r--r--www/apache22/Makefile5
-rw-r--r--www/aria/Makefile5
-rw-r--r--www/awffull/Makefile5
-rw-r--r--www/bluefish-devel/Makefile4
-rw-r--r--www/bluefish/Makefile4
-rw-r--r--www/c-icap/Makefile4
-rw-r--r--www/cacheboy15-devel/Makefile4
-rw-r--r--www/cacheboy16/Makefile4
-rw-r--r--www/cadaver/Makefile5
-rw-r--r--www/castget/Makefile1
-rw-r--r--www/cherokee/Makefile5
-rw-r--r--www/cssed/Makefile4
-rw-r--r--www/dillo-i18n/Makefile2
-rw-r--r--www/dillo/Makefile2
-rw-r--r--www/elinks/Makefile1
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/evolution-webcal/Makefile4
-rw-r--r--www/ffproxy/Makefile4
-rw-r--r--www/flashplugin-mozilla/Makefile4
-rw-r--r--www/flood/Makefile2
-rw-r--r--www/gecko-mediaplayer/Makefile4
-rw-r--r--www/gnome-user-share/Makefile4
-rw-r--r--www/gnome-web-photo/Makefile5
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/gurlchecker/Makefile4
-rw-r--r--www/hiawatha/Makefile5
-rw-r--r--www/hydra/Makefile5
-rw-r--r--www/kannel/Makefile4
-rw-r--r--www/kazehakase/Makefile6
-rw-r--r--www/libepc/Makefile4
-rw-r--r--www/libgtkhtml/Makefile4
-rw-r--r--www/lighttpd/Makefile2
-rw-r--r--www/links/Makefile2
-rw-r--r--www/lusca-head/Makefile4
-rw-r--r--www/middleman/Makefile4
-rw-r--r--www/midori/Makefile4
-rw-r--r--www/mod_clamav/Makefile2
-rw-r--r--www/mod_dnssd/Makefile6
-rw-r--r--www/mod_encoding/Makefile4
-rw-r--r--www/mod_musicindex/Makefile3
-rw-r--r--www/mod_ruby/Makefile1
-rw-r--r--www/nscache/Makefile5
-rw-r--r--www/oops/Makefile6
-rw-r--r--www/openvrml/Makefile6
-rw-r--r--www/pecl-amfext/Makefile2
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/resin2/Makefile2
-rw-r--r--www/resin3/Makefile2
-rw-r--r--www/retawq/Makefile5
-rw-r--r--www/rsstail/Makefile1
-rw-r--r--www/sarg/Makefile1
-rw-r--r--www/screem/Makefile4
-rw-r--r--www/seamonkey/Makefile2
-rw-r--r--www/seamonkey2/Makefile3
-rw-r--r--www/squid/Makefile3
-rw-r--r--www/squid30/Makefile2
-rw-r--r--www/squid31/Makefile2
-rw-r--r--www/srg/Makefile1
-rw-r--r--www/tntnet/Makefile6
-rw-r--r--www/tokyopromenade/Makefile2
-rw-r--r--www/trafficserver/Makefile2
-rw-r--r--www/ump/Makefile2
-rw-r--r--www/webalizer/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile6
-rw-r--r--www/websh/Makefile6
-rw-r--r--www/webstone-ssl/Makefile4
-rw-r--r--www/wsdlpull/Makefile5
-rw-r--r--www/xapian-omega/Makefile4
-rw-r--r--www/ziproxy/Makefile2
-rw-r--r--x11-clocks/cairo-clock/Makefile1
-rw-r--r--x11-clocks/rclock/Makefile2
-rw-r--r--x11-clocks/sanduhr/Makefile4
-rw-r--r--x11-fm/FSViewer/Makefile5
-rw-r--r--x11-fm/dfm/Makefile4
-rw-r--r--x11-fm/emelfm2/Makefile2
-rw-r--r--x11-fm/fsv/Makefile5
-rw-r--r--x11-fm/gentoo/Makefile7
-rw-r--r--x11-fm/gnome-commander2/Makefile4
-rw-r--r--x11-fm/mtoolsfm/Makefile4
-rw-r--r--x11-fm/nautilus/Makefile4
-rw-r--r--x11-fm/pcmanfm/Makefile1
-rw-r--r--x11-fm/tdfsb/Makefile4
-rw-r--r--x11-fm/tkdesk/Makefile3
-rw-r--r--x11-fm/xdiskusage/Makefile2
-rw-r--r--x11-fm/xfe/Makefile1
-rw-r--r--x11-fm/xnc/Makefile4
-rw-r--r--x11-fonts/ttmkfdir/Makefile2
-rw-r--r--x11-servers/x2vnc/Makefile4
-rw-r--r--x11-themes/clearlooks/Makefile4
-rw-r--r--x11-themes/emerald-themes/Makefile4
-rw-r--r--x11-themes/gnome-backgrounds/Makefile4
-rw-r--r--x11-themes/gnome-themes-extras/Makefile4
-rw-r--r--x11-themes/gnome-themes/Makefile4
-rw-r--r--x11-themes/gtk-engines2/Makefile3
-rw-r--r--x11-themes/kde-style-lipstik/Makefile2
-rw-r--r--x11-themes/kde-style-tiblit/Makefile2
-rw-r--r--x11-themes/kde-windeco-knifty/Makefile2
-rw-r--r--x11-toolkits/bakery/Makefile4
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/efltk/Makefile6
-rw-r--r--x11-toolkits/fl_editor/Makefile4
-rw-r--r--x11-toolkits/fltk/Makefile1
-rw-r--r--x11-toolkits/fltk2/Makefile1
-rw-r--r--x11-toolkits/fox14/Makefile5
-rw-r--r--x11-toolkits/fox16/Makefile5
-rw-r--r--x11-toolkits/fox17/Makefile5
-rw-r--r--x11-toolkits/gai/Makefile4
-rw-r--r--x11-toolkits/gal/Makefile4
-rw-r--r--x11-toolkits/gal2/Makefile4
-rw-r--r--x11-toolkits/gdl/Makefile4
-rw-r--r--x11-toolkits/gnustep-back/Makefile1
-rw-r--r--x11-toolkits/gnustep-gui/Makefile1
-rw-r--r--x11-toolkits/gob/Makefile4
-rw-r--r--x11-toolkits/gtk12/Makefile4
-rw-r--r--x11-toolkits/gtk20/Makefile6
-rw-r--r--x11-toolkits/gtk30/Makefile8
-rw-r--r--x11-toolkits/gtkglarea/Makefile4
-rw-r--r--x11-toolkits/gtkmathview/Makefile5
-rw-r--r--x11-toolkits/gtkmm24/Makefile4
-rw-r--r--x11-toolkits/gtkmm30/Makefile4
-rw-r--r--x11-toolkits/gtksourceview/Makefile4
-rw-r--r--x11-toolkits/gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/gtkunique/Makefile3
-rw-r--r--x11-toolkits/guile-gtk/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libgail-gnome/Makefile4
-rw-r--r--x11-toolkits/libgdiplus/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgtk-java/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile4
-rw-r--r--x11-toolkits/libgtksourceviewmm/Makefile4
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libzvt/Makefile4
-rw-r--r--x11-toolkits/mesgui/Makefile4
-rw-r--r--x11-toolkits/movingmotif/Makefile2
-rw-r--r--x11-toolkits/neXtaw/Makefile4
-rw-r--r--x11-toolkits/nucleo/Makefile4
-rw-r--r--x11-toolkits/open-motif/Makefile2
-rw-r--r--x11-toolkits/otk/Makefile4
-rw-r--r--x11-toolkits/pango/Makefile12
-rw-r--r--x11-toolkits/pangomm/Makefile4
-rw-r--r--x11-toolkits/pangoxsl/Makefile4
-rw-r--r--x11-toolkits/paragui-devel/Makefile4
-rw-r--r--x11-toolkits/paragui/Makefile4
-rw-r--r--x11-toolkits/plib/Makefile5
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile4
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/Makefile4
-rw-r--r--x11-toolkits/py-gtk2/Makefile11
-rw-r--r--x11-toolkits/rep-gtk2/Makefile5
-rw-r--r--x11-toolkits/soqt/Makefile4
-rw-r--r--x11-toolkits/tkdnd/Makefile3
-rw-r--r--x11-toolkits/tktray/Makefile3
-rw-r--r--x11-toolkits/tktreectrl/Makefile2
-rw-r--r--x11-toolkits/unique/Makefile4
-rw-r--r--x11-toolkits/vdk/Makefile5
-rw-r--r--x11-toolkits/vdkbuilder/Makefile5
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-toolkits/wxgtk24/Makefile12
-rw-r--r--x11-toolkits/wxgtk26/Makefile6
-rw-r--r--x11-toolkits/wxgtk28/Makefile4
-rw-r--r--x11-toolkits/wxgtk29/Makefile4
-rw-r--r--x11-toolkits/xforms/Makefile1
-rw-r--r--x11-wm/afterstep-stable/Makefile1
-rw-r--r--x11-wm/amaterus/Makefile5
-rw-r--r--x11-wm/bbkeys/Makefile4
-rw-r--r--x11-wm/bbpager/Makefile4
-rw-r--r--x11-wm/compiz-plugins-extra/Makefile4
-rw-r--r--x11-wm/compiz-plugins-main/Makefile4
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile4
-rw-r--r--x11-wm/compiz/Makefile2
-rw-r--r--x11-wm/devilspie/Makefile4
-rw-r--r--x11-wm/ede/Makefile1
-rw-r--r--x11-wm/emerald/Makefile4
-rw-r--r--x11-wm/epplets/Makefile4
-rw-r--r--x11-wm/fluxbox/Makefile8
-rw-r--r--x11-wm/icewm/Makefile3
-rw-r--r--x11-wm/jwm/Makefile4
-rw-r--r--x11-wm/libcompizconfig/Makefile4
-rw-r--r--x11-wm/libwraster/Makefile4
-rw-r--r--x11-wm/lwm/Makefile2
-rw-r--r--x11-wm/lxsession/Makefile1
-rw-r--r--x11-wm/matchbox/Makefile4
-rw-r--r--x11-wm/metacity/Makefile4
-rw-r--r--x11-wm/mutter/Makefile4
-rw-r--r--x11-wm/obconf/Makefile7
-rw-r--r--x11-wm/pekwm/Makefile2
-rw-r--r--x11-wm/phluid/Makefile4
-rw-r--r--x11-wm/sawfish/Makefile5
-rw-r--r--x11-wm/waimea-devel/Makefile4
-rw-r--r--x11-wm/windowmaker/Makefile4
-rw-r--r--x11-wm/wmanager/files/patch-aa2
-rw-r--r--x11-wm/xfce/Makefile4
-rw-r--r--x11/3ddesktop/Makefile5
-rw-r--r--x11/alltray/Makefile3
-rw-r--r--x11/aterm/Makefile3
-rw-r--r--x11/avant-window-navigator/Makefile4
-rw-r--r--x11/bbrun/Makefile1
-rw-r--r--x11/brightside/Makefile4
-rw-r--r--x11/erun/Makefile4
-rw-r--r--x11/eterm/Makefile4
-rw-r--r--x11/fireflies/Makefile4
-rw-r--r--x11/florence/Makefile1
-rw-r--r--x11/gdkxft/Makefile4
-rw-r--r--x11/gdm/Makefile6
-rw-r--r--x11/ggiterm/Makefile3
-rw-r--r--x11/gmrun/Makefile4
-rw-r--r--x11/gnome-applets/Makefile8
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnome-menus/Makefile4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-screensaver/Makefile4
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-shell/Makefile2
-rw-r--r--x11/gnome-swallow/Makefile6
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gsynaptics/Makefile4
-rw-r--r--x11/gtkterm2/Makefile5
-rw-r--r--x11/libdnd/Makefile4
-rw-r--r--x11/libfm/Makefile2
-rw-r--r--x11/libgnome-java/Makefile4
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/libgnomekbd/Makefile4
-rw-r--r--x11/libsynaptics/Makefile4
-rw-r--r--x11/libxklavier/Makefile3
-rw-r--r--x11/menu-cache/Makefile1
-rw-r--r--x11/mgapdesk/Makefile2
-rw-r--r--x11/mlterm/Makefile3
-rw-r--r--x11/mrxvt/Makefile4
-rw-r--r--x11/multi-gnome-terminal/Makefile4
-rw-r--r--x11/numlockx/Makefile5
-rw-r--r--x11/powershell/Makefile4
-rw-r--r--x11/rxvt-unicode/Makefile2
-rw-r--r--x11/sisctrl/Makefile4
-rw-r--r--x11/startup-notification/Makefile4
-rw-r--r--x11/thinglaunch/Makefile4
-rw-r--r--x11/wdm/Makefile7
-rw-r--r--x11/wmappl/Makefile4
-rw-r--r--x11/workrave/Makefile4
-rw-r--r--x11/wterm/Makefile2
-rw-r--r--x11/x3270/Makefile6
-rw-r--r--x11/xautomation/Makefile4
-rw-r--r--x11/xbindkeys/Makefile4
-rw-r--r--x11/xdialog/Makefile5
-rw-r--r--x11/xfree86_xkb_xml/Makefile4
-rw-r--r--x11/xkeyboard-config/Makefile2
-rw-r--r--x11/xloadimage/Makefile2
-rw-r--r--x11/xpyb/Makefile5
-rw-r--r--x11/xrestop/Makefile6
-rw-r--r--x11/xscreensaver-gnome/Makefile6
-rw-r--r--x11/xscreensaver.app/Makefile4
-rw-r--r--x11/xsel-conrad/Makefile2
-rw-r--r--x11/xsel/Makefile2
-rw-r--r--x11/xstroke/Makefile5
-rw-r--r--x11/xtermcontrol/Makefile4
-rw-r--r--x11/xvmcinfo/Makefile2
-rw-r--r--x11/yakuake/Makefile2
-rw-r--r--x11/yelp/Makefile4
-rw-r--r--x11/zenity/Makefile4
2382 files changed, 4063 insertions, 4694 deletions
diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk
index 3bfad7cc03bd..eeb895b6e1ec 100644
--- a/Mk/bsd.cmake.mk
+++ b/Mk/bsd.cmake.mk
@@ -60,6 +60,9 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \
-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
+ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
+ -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
+ -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" \
-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES
#
@@ -88,10 +91,10 @@ PLIST_SUB+= CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:L}"
.if defined(CMAKE_USE_PTHREAD)
CFLAGS+= ${PTHREAD_CFLAGS}
CXXFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CMAKE_ARGS+= -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
- -DCMAKE_USE_PTHREADS:BOOL=ON \
- -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}"
+ -DCMAKE_USE_PTHREADS:BOOL=ON
.endif
#
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 0048739b5e35..f68b1aa548a6 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -225,7 +225,6 @@ IGNORE= cannot install: unknown PostgreSQL version: ${PGSQL_VER}
.endif # Check for correct version
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.endif # USE_PGSQL
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
index 9ecb6cd9425b..140764563a36 100644
--- a/Mk/bsd.efl.mk
+++ b/Mk/bsd.efl.mk
@@ -520,9 +520,9 @@ LIB_DEPENDS+= ${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}
#
# Initialize configure enviropment
#
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= E17_ARCH=freebsd${OSREL}-${ARCH}
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index 90b16115018e..415bddec7a8e 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -452,6 +452,7 @@ do-configure:
@(cd ${CONFIGURE_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
INSTALL_DATA="${INSTALL} -c" \
INSTALL_PROGRAM="${INSTALL} -c" \
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 44535e213fdc..5eb1cdeb9124 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -92,8 +92,9 @@ QTCPPFLAGS+= -D_GETOPT_H # added to work around broken getopt.h #inc
.if !defined (QT_NONSTANDARD)
CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
--with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+= MOC="${MOC}" LIBS="${QTCFGLIBS}" \
QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"
+CPPFLAGS+= ${QTCPPFLAGS}
.endif
.elif ${USE_QT_VER} == 3
@@ -123,8 +124,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
--with-qt-libraries=${QT_PREFIX}/lib \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+= MOC="${MOC}" LIBS="${QTCFGLIBS}" \
QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CPPFLAGS+= ${QTCPPFLAGS}
.endif # !defined(QT_NONSTANDARD)
.else
diff --git a/Mk/bsd.ncurses.mk b/Mk/bsd.ncurses.mk
index 4e8388193516..8eb30a7d5f2f 100644
--- a/Mk/bsd.ncurses.mk
+++ b/Mk/bsd.ncurses.mk
@@ -91,8 +91,6 @@ NCURSES_LDFLAGS+= -rpath=${NCURSESRPATH}
.if defined(LDFLAGS)
LDFLAGS+=${NCURSES_LDFLAGS}
.else
-LDFLAGS=${NCURSES_LDFLAGS}
+LDFLAGS+=${NCURSES_LDFLAGS}
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index 0bc1503a0f95..44123d148b6e 100644
--- a/Mk/bsd.openssl.mk
+++ b/Mk/bsd.openssl.mk
@@ -2,7 +2,7 @@
# Date created: 31 May 2002
# Whom: dinoex
#
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.45 2010-01-12 15:46:24 dinoex Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.46 2011-09-23 22:20:46 amdmi3 Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
@@ -135,14 +135,8 @@ CFLAGS+= -Wl,-rpath,${OPENSSLRPATH}
.endif
OPENSSL_LDFLAGS+= -rpath=${OPENSSLRPATH}
-.if defined(LDFLAGS)
LDFLAGS+=${OPENSSL_LDFLAGS}
-.else
-LDFLAGS=${OPENSSL_LDFLAGS}
-.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 435cec57693a..773d1610d148 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2200,6 +2200,7 @@ MAKE_ENV+= PREFIX=${PREFIX} \
MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
CC="${CC}" CFLAGS="${CFLAGS}" \
CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
MANPREFIX="${MANPREFIX}"
@@ -3689,6 +3690,7 @@ do-configure:
${SET_LATE_CONFIGURE_ARGS} \
if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_LIB="${INSTALL_LIB}" \
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index ecb58b5acb89..63711d604a59 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -25,8 +25,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
--with-qt-libraries=${QT_LIBDIR} \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" LIBS="${QTCFGLIBS}" \
QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}"
+CPPFLAGS+= ${QTCPPFLAGS}
MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
.endif # !defined(QT_NONSTANDARD)
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 2e2058756131..258c6ff522ca 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_DISPLAY= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= accerciser.schemas
MAN1= accerciser.1
diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index df5a67555f41..417a33e9e276 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -18,7 +18,7 @@ COMMENT= Accessibility testing and poking tool
USE_GMAKE= yes
USE_GNOME= gnomeprefix libglade2 libgailgnome
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/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index f87f110b2a5d..7b85d1d16399 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= at-spi.schemas
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index af037e1989a8..3a9f37676e0d 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomehier intlhack gconf2 libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= at-spi2.schemas
.include <bsd.port.mk>
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index ff63c8d7d3f5..f3a594bfdf5e 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack gnomehier intlhack
USE_XORG= x11 xi xtst
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
-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/accessibility/atk/Makefile b/accessibility/atk/Makefile
index ba7b69b834ee..cdc84181c444 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -30,9 +30,9 @@ USE_GNOME= gnomehack glib20 ltverhack referencehack
CONFIGURE_ARGS= --enable-static \
--disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
post-patch:
@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index 0e4d19df9ea6..34a9448cf6f6 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomehack atk
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation
.include <bsd.port.mk>
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 250808bc024b..8b330013c566 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -29,8 +29,8 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= dasher.schemas
MAN1= dasher.1
diff --git a/accessibility/eflite/Makefile b/accessibility/eflite/Makefile
index 7ee5eb523e37..59d4aaa03ba8 100644
--- a/accessibility/eflite/Makefile
+++ b/accessibility/eflite/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --with-vox=${FL_VOX}
CONFIGURE_ARGS+= --with-vox=cmu_us_kal16
.endif
-CONFIGURE_ENV+= flite_dir=${LOCALBASE}
+CONFIGURE_ENV+= flite_dir=${LOCALBASE}
PLIST_FILES= bin/eflite
PORTDOCS= AUTHORS CREDITS ChangeLog INSTALL README
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 0351c4822859..8277994bfbb4 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCSDIR= ${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 47e4195b20c1..70e217980fbf 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= gnomehack gnomeprefix libbonobo
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
-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/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 26c3e229ee66..ffe04da3b2d7 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= SED="${SED}"
GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 63bc6a6b8c3c..926a2bc01d6e 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -27,8 +27,8 @@ USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
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
GCONF_SCHEMAS= gok.schemas
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 208d4dca6ead..12cd84f75822 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_GETTEXT= 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
GCONF_SCHEMAS= mousetweaks.schemas pointer-capture-applet.schemas
MAN1= dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index e7ad1ef28065..e9a9c295b144 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -34,8 +34,8 @@ USE_GNOME= gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
pygnomedesktop
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= orca.1
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index f5ae0ee28867..f130466271be 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2
GNU_CONFIGURE= yes
USE_PYTHON= 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/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 65a4c50ed7a1..f3b647bc0f96 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS= dotconf.0:${PORTSDIR}/devel/dotconf \
USE_GNOME= glib20 pkgconfig
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
CONFFILES= clients/emacs.conf clients/gnome-speech.conf \
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index ef3294cba5fe..a2679ff53aba 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --libdir=${PREFIX}/lib
-CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS= TOBUILD="dact libdact.so dact.conf"
MAN1= dact.1
diff --git a/archivers/epkg/Makefile b/archivers/epkg/Makefile
index 21e86fbc8530..3b1ae0a258cb 100644
--- a/archivers/epkg/Makefile
+++ b/archivers/epkg/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
expat.6:${PORTSDIR}/textproc/expat2
HAS_CONFIGURE= YES
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${PREFIX}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-encap --disable-epkg-install --without-libtar \
--with-libfget \
--prefix=${PREFIX}
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 299c8ec781e4..9bb3931f1368 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
GNOME_DESKTOP_VERSION=2
USE_XORG= sm
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-packagekit
PORTDOCS= AUTHORS NEWS README TODO ChangeLog
diff --git a/archivers/grzip/Makefile b/archivers/grzip/Makefile
index 55d45194f8eb..e06bc63f28b1 100644
--- a/archivers/grzip/Makefile
+++ b/archivers/grzip/Makefile
@@ -19,7 +19,6 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include -fPIC
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
ALL_TARGET= ${PORTNAME}
WRAPPERS= grztar grzdiff grzgrep grzmore
PLIST_FILES= bin/${PORTNAME} bin/grunzip bin/grzcat ${WRAPPERS:S|^|bin/|} \
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 278fd628577d..e576eb1be08c 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -27,9 +27,9 @@ GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --program-prefix=g \
--disable-silent-rules
-CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib ${LDSTATIC}' \
- DEFAULT_ARCHIVE=/dev/sa0 \
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${LDSTATIC}
+CONFIGURE_ENV= DEFAULT_ARCHIVE=/dev/sa0 \
DEFAULT_RMT_COMMAND=/etc/rmt
.if defined(WANT_STATIC)
@@ -60,7 +60,7 @@ RUN_DEPENDS+= xz:${PORTSDIR}/archivers/xz
.if ${OSVERSION} < 800040
CONFIGURE_ENV+= gl_cv_func_mknod_works=no
.else
-CONFIGURE_ENV+= gl_cv_func_mknod_works=yes
+CONFIGURE_ENV+= gl_cv_func_mknod_works=yes
.endif
.include <bsd.port.post.mk>
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 4f1fe9f655f7..f23844b61b3c 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -46,8 +46,7 @@ MAN5= cpio.5 \
CFLAGS+= "-I${LOCALBASE}/include"
CPPFLAGS+= "-I${LOCALBASE}/include"
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= "-L${LOCALBASE}/lib"
check:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index bc223b73777c..a965eb0324cc 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -20,8 +20,8 @@ COMMENT= Transparently handles automatic compression and decompression of files
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
USE_LDCONFIG= yes
.if !defined(WITHOUT_NLS)
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index d2c2553a4a94..9c415960303f 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -31,8 +31,6 @@ USE_GNOME= gnomehack
USE_ICONV= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= orange.1
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index 319dd15af618..fdf4159c37b4 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile
index d34c00fc801a..ca705413d544 100644
--- a/archivers/libunrar/Makefile
+++ b/archivers/libunrar/Makefile
@@ -19,7 +19,6 @@ WRKSRC= ${WRKDIR}/unrar
USE_GMAKE= yes
MAKEFILE= makefile.unix
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
ALL_TARGET= lib
USE_LDCONFIG= yes
diff --git a/archivers/libunrar4/Makefile b/archivers/libunrar4/Makefile
index 8f4d39627707..eca879c5486d 100644
--- a/archivers/libunrar4/Makefile
+++ b/archivers/libunrar4/Makefile
@@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/unrar
USE_GMAKE= yes
MAKEFILE= makefile.unix
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
ALL_TARGET= lib
USE_LDCONFIG= yes
diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile
index 1e657e30fbd7..4b495045d27f 100644
--- a/archivers/lrzip/Makefile
+++ b/archivers/lrzip/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= lzo2:${PORTSDIR}/archivers/lzo2
LICENSE= GPLv2
CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-asm
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index 8cb39530be52..a697a0b84c04 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= lzo.1:${PORTSDIR}/archivers/lzo
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= lzop.1
PLIST_FILES= bin/lzop
diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile
index 068678a13d60..50abc2eb4fa4 100644
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@@ -21,8 +21,8 @@ LICENSE= GPLv2
ONLY_FOR_ARCHS= i386 amd64 ia64
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}
USE_AUTOTOOLS= aclocal automake autoconf
USE_GCC= 4.2+
diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index 9c20ad171e0f..c5b7aa9ef2a4 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -32,7 +32,6 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin \
LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
.endif
.if ${ARCH} == "sparc64"
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 4889e588dfa5..930d135f166d 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -33,8 +33,8 @@ PLIST_SUB+= NLS="@comment "
.else
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -liconv"
.endif
MAN1= gendiff.1
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 252c50020e6b..b3b862d0623a 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -67,7 +67,6 @@ PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--without-db \
--with-popt-prefix="${LOCALBASE}" \
--sysconfdir=${PREFIX}/etc \
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 0f86a7c75f04..594130e63ffb 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=--without-lua \
.if defined(WITH_PERL)
CONFIGURE_ARGS+=--with-perl
-CONFIGURE_ENV+=__PERL=${PERL}
+CONFIGURE_ENV+= __PERL=${PERL}
USE_PERL5= yes
PLIST_SUB+= PERL=""
.else
@@ -71,7 +71,7 @@ PLIST_SUB+= PERL="@comment "
.if defined(WITH_PYTHON)
CONFIGURE_ARGS+=--with-python=${PYTHON_VER}
-CONFIGURE_ENV+=__PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+= __PYTHON=${PYTHON_CMD}
USE_PYTHON= yes
PLIST_SUB+= PYTHON=""
CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
@@ -96,7 +96,6 @@ CONFIGURE_ARGS+=--with-apidocs
CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/xar
LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-db=external --with-bugreport="${MAINTAINER}" \
--with-sqlite=external --with-dbabi=db \
--with-zlib=external \
diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index aa5ae56491cf..7091e6d533dc 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -20,8 +20,8 @@ LICENSE_FILE= ${WRKSRC}/readme.txt
USE_ICONV= yes
PLIST_FILES= bin/unalz
MAKEFILE= Makefile.freebsd
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/unalz
pre-patch:
diff --git a/archivers/unmakeself/Makefile b/archivers/unmakeself/Makefile
index 152002996e7b..c4dc399683dc 100644
--- a/archivers/unmakeself/Makefile
+++ b/archivers/unmakeself/Makefile
@@ -13,7 +13,7 @@ DISTFILES=
MAINTAINER= ports@FreeBSD.org
COMMENT= Extract Makeself archives
-LDFLAGS= -larchive -lbz2 -lz -lcrypto -lmd
+LDFLAGS+= -larchive -lbz2 -lz -lcrypto -lmd
NO_WRKSUBDIR= yes
PLIST_FILES= bin/unmakeself
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 7d2d810e9834..f04daad7c53b 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -26,8 +26,8 @@ INSTALLS_ICONS= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 93c9d90d6de4..7e3948e2b5c6 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -27,8 +27,8 @@ USE_LUA= 5.0+ # should be optional, but the build fails without it
WANT_GNOME= yes
CXXFLAGS+= -fsigned-char # fix text rendering (see Gentoo bug 316573)
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
UI_LIST= glut gtk gnome kde
CELESTIA_UI?= glut
diff --git a/astro/fowsr/Makefile b/astro/fowsr/Makefile
index 703bfc341f44..d7b50d4827b6 100644
--- a/astro/fowsr/Makefile
+++ b/astro/fowsr/Makefile
@@ -38,9 +38,8 @@ do-install:
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-CFLAGS+= -I${PREFIX}/include
-LDFLAGS+= "-L${PREFIX}/lib"
-MAKE_ENV+= "LDFLAGS=${LDFLAGS}"
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
.include <bsd.port.post.mk>
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index 23043b791cc2..db464fb286d6 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -20,9 +20,9 @@ USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
INSTALLS_OMF= yes
PLIST_SUB= VERSION="${PORTVERSION:R}"
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 3284c66b891f..68fbb18a8f9d 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gtk20
USE_AUTOTOOLS= libtool
MAKE_JOBS_UNSAFE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-garmin
USE_LDCONFIG= yes
diff --git a/astro/libroadnav/Makefile b/astro/libroadnav/Makefile
index 481ad4b6913f..720cac2e828c 100644
--- a/astro/libroadnav/Makefile
+++ b/astro/libroadnav/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= *
diff --git a/astro/mymoon/Makefile b/astro/mymoon/Makefile
index 6c5762f5842d..598602e846e3 100644
--- a/astro/mymoon/Makefile
+++ b/astro/mymoon/Makefile
@@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/mymoon
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index f8bc9b620c7f..f7c58b1f542f 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -23,8 +23,8 @@ USE_PERL5= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-locale-prefix=${PREFIX}/share/locale
MAN1= nightfall.1
diff --git a/astro/nova/Makefile b/astro/nova/Makefile
index 3d8a6c8fbf4b..0dc70a18da4c 100644
--- a/astro/nova/Makefile
+++ b/astro/nova/Makefile
@@ -27,8 +27,8 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
RUN_DEPENDS= ${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --datadir=${DATADIR}
.include <bsd.port.mk>
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index 4f0ec02377f6..cb1915fe1d93 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -25,9 +25,9 @@ USE_GMAKE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib" \
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/GL -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lm" \
- LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include/GL -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lm
MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
.include <bsd.port.mk>
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index a7dd8ad844a6..c5f94e38e534 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -20,7 +20,7 @@ MAN1= rmap.1
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/astro/roadnav/Makefile b/astro/roadnav/Makefile
index ef93ff369dd2..b3f6127c6b15 100644
--- a/astro/roadnav/Makefile
+++ b/astro/roadnav/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= *
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index 5c2d45b88b37..1a4b46958f92 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -18,8 +18,8 @@ USE_GNOME= gnomehack gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= starconvert.1 starpkg.1 starplot.1
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 4d6d9f826a92..2cc97af5ec01 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS= gpsbabel:${PORTSDIR}/astro/gpsbabel
OPTIONS= GPSD "Enable realtime GPS tracking" off
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CPPFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 6db314e8a472..a07a84294885 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -17,8 +17,8 @@ GNU_CONFIGURE= yes
USE_XORG= xt xscrnsaver
USE_GNOME= #
CONFIGURE_ARGS= --with-map-extension=jpg
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lm"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lm"
+CPPFLAGS+= -I${LOCALBASE}/include
OPTIONS= FREETYPE "Enable Freetype support" on \
PANGO "Enable PANGO support" on \
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 6eb3a26c8868..e824482b68dd 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -24,13 +24,12 @@ LICENSE= GPLv3
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= tide.1
MAN8= xttpd.8
-CPPFLAGS= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
-LDFLAGS= -L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
+CPPFLAGS+= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
+LDFLAGS+= -L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
TCD_DISTNAME= libtcd-2.2.5
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 48bc40347d4d..81a5f0fa3bc0 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -30,7 +30,6 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --sharedstatedir=${DATADIR}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
LICENSE= GPLv2
MAN1= adplay.1
diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile
index 68352f7665c1..708c4ca08441 100644
--- a/audio/akode-plugins-ffmpeg/Makefile
+++ b/audio/akode-plugins-ffmpeg/Makefile
@@ -35,7 +35,7 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
USE_LDCONFIG= yes
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index 59be97be757d..9d970001540b 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -33,7 +33,7 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/akode-${PORTVERSION}
USE_LDCONFIG= yes
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile
index 4b8847b22ef5..5007c3d4c4b2 100644
--- a/audio/akode-plugins-mpc/Makefile
+++ b/audio/akode-plugins-mpc/Makefile
@@ -35,7 +35,7 @@ PLIST_FILES= lib/libakode_mpc_decoder.a \
lib/libakode_mpc_decoder.la \
lib/libakode_mpc_decoder.so
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile
index 3bbcdda0e189..836f2bad532e 100644
--- a/audio/akode-plugins-mpeg/Makefile
+++ b/audio/akode-plugins-mpeg/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES= lib/libakode_mpeg_decoder.a \
lib/libakode_mpeg_decoder.la \
lib/libakode_mpeg_decoder.so
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile
index 75a5ebf0210c..934b392eada3 100644
--- a/audio/akode-plugins-oss/Makefile
+++ b/audio/akode-plugins-oss/Makefile
@@ -35,7 +35,7 @@ PLIST_FILES= lib/libakode_oss_sink.a \
lib/libakode_oss_sink.la \
lib/libakode_oss_sink.so
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-pulseaudio/Makefile b/audio/akode-plugins-pulseaudio/Makefile
index a50fee9663c5..109b1caa3457 100644
--- a/audio/akode-plugins-pulseaudio/Makefile
+++ b/audio/akode-plugins-pulseaudio/Makefile
@@ -36,7 +36,7 @@ USE_LDCONFIG= yes
PLIST_FILES= lib/libakode_polyp_sink.a lib/libakode_polyp_sink.la \
lib/libakode_polyp_sink.so
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile
index deb4ec12dcd4..120a45fe0686 100644
--- a/audio/akode-plugins-resampler/Makefile
+++ b/audio/akode-plugins-resampler/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES= lib/libakode_src_resampler.a \
lib/libakode_src_resampler.la \
lib/libakode_src_resampler.so
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index bef06bcb8dcf..d36279c0a852 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -41,7 +41,7 @@ PLIST_FILES= lib/libakode_xiph_decoder.a \
lib/libakode_xiph_decoder.la \
lib/libakode_xiph_decoder.so
-CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs
+LDFLAGS+= -L${WRKSRC}/akode/lib/.libs
CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 773667bf1ff5..2df875680364 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= JACK "JACK audio support (requires SAMPLERATE)" Off \
LAVC "libavcodec support" Off \
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-jack
.if defined(WITH_LAVC)
CONFIGURE_ARGS+= --enable-avcodec
-CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include
+CFLAGS+= -I${LOCALBASE}/include
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= LAVC=""
.else
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index e68033e15dd5..417bc8116f0f 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include"
+CFLAGS+= -I${LOCALBASE}/include
MAN1_EN= aconnect.1 alsactl.1 alsamixer.1 amidi.1 amixer.1 aplay.1 aplaymidi.1 \
arecordmidi.1 aseqdump.1 aseqnet.1 iecset.1 speaker-test.1
@@ -42,11 +42,11 @@ CONFIGURE_ARGS+=--disable-xmlto
.endif
.if defined(WITHOUT_NLS)
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 7a09f1024fb3..ca3e3dc6d288 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -42,9 +42,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name="" --with-alsa=no --with-ifp=no \
--with-cdda=no
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lstrfunc
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lstrfunc
MAN1= ${PORTNAME}.1
OPTIONS= JACK "Enable JACK low-latency audio server support" Off \
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 911b3aac4f8e..a2f3b21fdd67 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -68,9 +68,7 @@ CPPFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include
CXXFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
CFLAGS+= -I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- WX_CONFIG="${WX_CONFIG}"
+CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"
.if !defined(NOPORTDOCS)
MAKE_ENV= DOC=yes
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 1ca7f8f0d1cd..57c87d54d364 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -37,9 +37,9 @@ OPTIONS= ID3TAG "ID3 tag support" off \
SSE_CFLAGS= -mno-sse -mno-sse2
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+= -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if !defined(NOPORTDOCS)
MAKE_ENV= DOC=yes
diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile
index 3e2aaea91eb2..834fbe1f8f26 100644
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@@ -20,9 +20,9 @@ WANT_WX= yes
USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include/speex -I${LOCALBASE}/include" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include/speex -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= changelog.txt cvs.txt dependencies.txt faq.txt glossary.txt \
license.txt overview.txt readme.txt release-howto.txt \
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index dffa57c096ab..ec7a4811f7e1 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--enable-own-labels \
--libdir="${LOCALBASE}/lib"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= aumix.1 xaumix.1 mute.1
PLIST_DIRS= share/aumix
diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 9a868c287b9a..101dd97a164e 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -17,13 +17,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-ladspa-prefix="${LOCALBASE}"
OPTIONS= NLS "Native language support" on
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 744b696ef46d..115330c751b4 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_AUTOTOOLS= autoconf libtool
CPPFLAGS+= "-I${LOCALBASE}/include"
PLUGDIR= lib/bmp/Input
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index d5a9670f91ab..c7433a528ae1 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -30,9 +30,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade2 glib20
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --program-transform-name="" --disable-static
WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//}
diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index da3864b2c9a0..3e83c486a94b 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -22,7 +22,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index fa10aef9ee9b..daf890c43814 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -26,8 +26,9 @@ OPTIONS= VORBIS "Ogg Vorbis support" on \
USE_AUTOTOOLS= aclocal autoconf
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
- ac_cv_prog_acx_pthread_config=no
+CONFIGURE_ENV= ac_cv_prog_acx_pthread_config=no
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --without-alsa
SUB_FILES= pkg-message
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 3e41f4c9d9e8..5085749ccb4f 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS= --enable-jack \
PORTDOCS= *
PORTEXAMPLES= *
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 4f62cbb39e81..13e8fb10592d 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -37,6 +37,5 @@ CONFIGURE_ARGS= --with-flac=${LOCALBASE}/lib/libFLAC.so \
.if defined(NOPORTDOCS)
CONFIGURE_ARGS+= --docdir=${WRKDIR}/doc
.endif
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 3d8fed0df6b7..5fe21694a110 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -27,8 +27,8 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_WAVPACK)
LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 9d2f3eeee043..6a2c18d6bb09 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -26,8 +26,8 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_WAVPACK)
LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 395494fdd7f3..4d5da8528b5c 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -27,7 +27,6 @@ LICENSE_COMB= dual
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-pyecasound \
--disable-rubyecasound \
--enable-sys-readline
@@ -38,8 +37,8 @@ MAN1= ecaconvert.1 ecafixdc.1 ecalength.1 ecamonitor.1 \
ecasound-iam.1 ecatools.1
MAN5= ecasoundrc.5
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile
index fd9bfe0dcb7c..8cded707ba5f 100644
--- a/audio/ermixer/Makefile
+++ b/audio/ermixer/Makefile
@@ -27,8 +27,8 @@ USE_PERL5_BUILD= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ENV+= CPPFLAGS="${PTHREAD_CFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
PLIST_FILES= bin/ermixer
.include <bsd.port.pre.mk>
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 8f8d1c0d1bcf..095925ad587e 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= portaudio:${PORTSDIR}/audio/portaudio
CONFLICTS= speak-1.[0-9]
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
USE_GMAKE= yes
USE_GCC= 4.2+
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 2bf02deb82d0..bcd95fcf6fed 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3
USE_GNOME= esound gnomehack gnomehier gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/extace \
share/gnome/apps/Multimedia/extace.desktop
diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile
index 983c83065f98..52acd11cbb83 100644
--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@@ -24,7 +24,6 @@ USE_GNOME= libxml2
USE_ICONV= yes
USE_RC_SUBR= ${PORTNAME}
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ezstream.1 ezstream-file.sh.1
PORTDOCS= NEWS README
@@ -34,8 +33,8 @@ PORTEXAMPLES= ezstream_metadata.xml ezstream_mp3.xml \
ezstream_vorbis.xml meta.sh play.sh
PLIST_FILES= bin/ezstream bin/ezstream-file.sh etc/ezstream/ezstream.xml '@dirrm etc/ezstream'
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index feedc7e7527a..dbc2d8c0021f 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -26,8 +26,8 @@ USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --with-mp4v2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
MAN1= faac.1
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index c685df2cc7e7..583d7ba9e38b 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -22,8 +22,8 @@ MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_LDCONFIG= yes
MAN1= faad.1
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
index 4f8d7575d749..c8065cce1aef 100644
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@@ -26,10 +26,10 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \
CONFLICTS= mt-daapd-0.2.*
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS+="${PTHREAD_CFLAGS}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --prefix=${PREFIX} --with-id3tag=${PREFIX} \
--enable-sqlite3 --enable-oggvorbis --enable-flac
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 231fda490bfe..9421588e9884 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS= --enable-sse \
--with-ogg="${LOCALBASE}" \
--disable-thorough-tests \
--disable-xmms-plugin
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include"
+CPPFLAGS+= -I${WRKSRC}/include
MAKE_JOBS_SAFE= yes
.if !defined(WITHOUT_ICONV)
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index a3858963a893..4e73aca0ae3c 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -22,7 +22,6 @@ OPTIONS= JACK "Enable Jack audio support" On \
USE_GNOME= glib20 gnomehack pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-alsa-support --disable-midishare \
--disable-coreaudio --disable-coremidi \
--disable-dart --disable-lash \
@@ -31,8 +30,8 @@ USE_LDCONFIG= yes
MAN1= fluidsynth.1
-CPPFLAGS= ${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= ${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= ${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index 05b78001a3cb..d5742251d06c 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -16,7 +16,8 @@ COMMENT= The OpenAL Utility Toolkit
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
USE_OPENAL= al
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index f05016bbf770..34a0a83af58e 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -30,13 +30,12 @@ USE_BZIP2= yes
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-jackmidi
MAN1= ghostess.1
PLIST_FILES= bin/ghostess bin/ghostess_universal_gui
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index 7b679ccceec5..11d77a0aefd2 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so.3:${PORTSDIR}/audi
BUILD_DEPENDS= ${RUN_DEPENDS}
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 1a92e0b0fee1..ce2a41512f1a 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -37,8 +37,8 @@ MAN1= gimmix.1
CONFIGURE_ENV= DATADIRNAME=share
.if !defined(WITHOUT_NLS)
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --enable-nls
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index f639a40ecf16..1f46badfa423 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -26,13 +26,12 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
INFO= glame glame-dev
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lltdl
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lltdl
post-extract:
@cd ${WRKSRC}/doc && ${RM} -f *.info*
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 7f87585b5134..bd25faf89f7f 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gnomehack pkgconfig glib20 gtk20 libxml2
USE_GETTEXT= yes
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 80e0c267bf23..6fe519078e0b 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -28,7 +28,8 @@ USE_GNOME= gnomehack pkgconfig glib20 gtk20 libglade2
INSTALLS_ICONS= yes
USE_GETTEXT= yes
CONFIGURE_ARGS= --enable-system-libsexy
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gmpc-remote.1 gmpc.1
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 3b0eb575bed3..2dcfa6341f42 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
USE_GNOME= imlib
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 9af09efbc863..09616729ef21 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -31,8 +31,8 @@ GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
USE_GSTREAMER= gconf good
CONFIGURE_ARGS= --disable-gstmix
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-audio-profiles.schemas \
gnome-sound-recorder.schemas
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 138b9e720421..cde6d6d1b29d 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomehack gnomeprefix
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
LIBTOOLFLAGS= --tag=CXX
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \
diff --git a/audio/gogo-petit/Makefile b/audio/gogo-petit/Makefile
index 965059535f2b..841773723c07 100644
--- a/audio/gogo-petit/Makefile
+++ b/audio/gogo-petit/Makefile
@@ -25,8 +25,7 @@ AS = nasm
AFLAGS = -f elf -Ox
ALL_TARGET= test
MAKE_ENV+= AS="${AS}" \
- AFLAGS="${AFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+ AFLAGS="${AFLAGS}"
ONLY_FOR_ARCHS= i386
PLIST_FILES= bin/gogo-petit
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index aa429d30c49c..b72f9fa01e2e 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -28,8 +28,8 @@ USE_GSTREAMER= cdparanoia gconf core
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= goobox.schemas
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 099aae67e3bd..8d83d7ec1b20 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -34,8 +34,8 @@ USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFLICTS= gqmpeg-0.2*
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 619ceae8b75a..2dd7823ca662 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= gdkpixbuf
WANT_GNOME= yes
USE_AUTOTOOLS= autoconf213 libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gqmpeg.1
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index c369b525cdba..2c9935a5804d 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -19,8 +19,8 @@ USE_GNOME= gtk20 gnomehack gnomeprefix
ONLY_FOR_ARCHS= alpha i386 ia64
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|\(doc/gqradio\)-\$$VERSION|\1|' \
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 20ea1bb3c1b3..d971c0c2744d 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -21,8 +21,8 @@ USE_XORG= x11
USE_GNOME= gnomehack gnomeprefix libgnomeui vte
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= CDPARANOIA "Ripper: Enable cdparanoia support" on \
CDDA2WAV "Ripper: cdda2wav: Install sysutils/cdrtools" off
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 67dc7fb05095..06e5703a5a64 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gnomeprefix libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= automake:env
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -O0
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index ed5c359a42fb..cb67018886b0 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gtick.1
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 64a8889793fc..031427f2212f 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -22,7 +22,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libglade2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_ICONS= yes
MAN1= gtkpod.1
diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile
index dab21d034813..22a5cc6f5874 100644
--- a/audio/hawkvoice/Makefile
+++ b/audio/hawkvoice/Makefile
@@ -20,10 +20,9 @@ USE_GMAKE= yes
MAKEFILE= makefile.linux
USE_LDCONFIG= yes
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS= -I${LOCALBASE}/include
-MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
- MAKE="${GMAKE}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+MAKE_ENV= MAKE="${GMAKE}"
WRKSRC= ${WRKDIR}/HawkVoiceDI/src
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 68907a59c2ee..4d7e9049abfe 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -30,7 +30,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_RC_SUBR= icecast2.sh
SUB_FILES+= pkg-message
-CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE}
+CFLAGS+= -I${LOCALBASE}/include
DOCSDIR= ${PREFIX}/share/doc/icecast
WRKSRC= ${WRKDIR}/icecast-${PORTVERSION}
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index d0df6f024ad3..e428aad126d3 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= shout.5:${PORTSDIR}/audio/libshout2 \
vorbis.4:${PORTSDIR}/audio/libvorbis \
xml2.5:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_BZIP2= yes
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
index 5151ad92eeb0..fc6fe77eb439 100644
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@@ -22,8 +22,8 @@ OPTIONS= FLAC "Enable flac transcoding support" Off \
VORBIS "Enable ogg/vorbis transcoding support" Off \
PYTHON "Enable Python scripting" On
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 22eaa979cee2..a2d5c2daefcc 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -17,11 +17,10 @@ COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
USE_AUTOTOOLS= libtool
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
@${RM} -rf ${WRKSRC}/zlib
diff --git a/audio/istream/Makefile b/audio/istream/Makefile
index df49665b4bac..0ed81511919b 100644
--- a/audio/istream/Makefile
+++ b/audio/istream/Makefile
@@ -20,7 +20,7 @@ USE_GSTREAMER= yes
USE_XORG= xtst
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}c
-CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`"
+CPPFLAGS+= `pkg-config --cflags libgnomeui-2.0`
MAKE_JOBS_SAFE= yes
post-patch:
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 9f18af491106..5aa45703a026 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -24,8 +24,8 @@ USE_GNOME= libgnomeui libxml2
USE_GETTEXT= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-ladcca --disable-lash
post-patch:
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index a61da5970a5f..d1a72be8c8db 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -24,7 +24,7 @@ LIBS+= ${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LIBS="${LIBS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LIBS="${LIBS}"
CONFIGURE_ARGS+=--enable-portaudio \
--with-default-tmpdir=/tmp
GNU_CONFIGURE= yes
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index ddc7e4749005..e590971d521c 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -21,8 +21,8 @@ MANCOMPRESSED= no
GNU_CONFIGURE= yes
USE_ICONV= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
MANLANG= "" ja
MAN1= accept_check.1 \
adinrec.1 \
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 35803218205e..91ff00510283 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -21,12 +21,11 @@ NO_WRKSUBDIR= yes
USE_GNOME= gnomehack
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ksmp3play.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index 62981351f7c9..c1305cdf072a 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -25,12 +25,11 @@ USE_GNOME= gnomehack gtk20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-alsa-midi
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include/dssi -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include/dssi -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index c9bec52c1a04..51bb0b4d05ba 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG= yes
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
RUN_DEPENDS+= ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-djbfft
.endif
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index bd094df89ad8..41c53afc0de7 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool libltdl
CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(SLAVEPORT)
GCONF_SCHEMAS= libcanberra.schemas
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 40e51ac80887..41a7afd0f493 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomehack pkgconfig
USE_ICONV= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-cdio
-CONFIGURE_ENV= CPPFLAGS="-DICONV_CONST=\"const\" -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -DICONV_CONST="const" -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 4977af94a515..824d23b8ac97 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -25,8 +25,8 @@ USE_GNOME= gtk20
USE_SQLITE= 3
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-hal --with-html-dir="${PREFIX}/share/doc"
OPTIONS= IMOBILE "Support Apple iPhone/iPod Touch" on \
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index b5f4e7e82d99..db993d345553 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -81,6 +81,6 @@ PLIST_FILES+= "@dirrmtry share/locale/de_DE"
.endif
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.post.mk>
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index 645733199bd2..ecd8c00e43b4 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -16,14 +16,13 @@ COMMENT= Media Transfer Protocol (MTP) library
LICENSE= LGPL21
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
USE_GNOME= gnomehack
USE_LDCONFIG= yes
USE_ICONV= yes
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -liconv
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800069
diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index 5ace2bcda830..760b240ece34 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -22,8 +22,8 @@ CONFLICTS= musicbrainz-1.*
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index 890cc871718b..d6e0cde1a860 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -15,8 +15,8 @@ COMMENT= C library, API for communicating with Creative and Dell audio players
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index bbf0f6056d12..3d939d6dfac3 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -23,8 +23,8 @@ USE_DOS2UNIX= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 3d6c175b73a0..e4c99fc531f0 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
theora.0:${PORTSDIR}/multimedia/libtheora \
vorbis.4:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
USE_LDCONFIG= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 843e86e9479d..6681e86175a3 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS= --disable-gcc-pipe \
--disable-alsa \
--disable-octave
CPPFLAGS+= -isystem /usr/include -isystem ${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
MAN1= sndfile-concat.1 sndfile-cmp.1 sndfile-convert.1 \
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 9e883cbdcd20..72e3fa80d337 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -31,8 +31,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
USE_LDCONFIG= ${PREFIX}/lib/tunepimp-0.4
post-patch:
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 501f379976f0..4cfd496f22f0 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -31,8 +31,8 @@ CONFLICTS= trm-0*
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
USE_LDCONFIG= yes
post-patch:
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 375de399104b..6ef8a32fd1ac 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -32,19 +32,19 @@ USE_GNOME= gnomehack
USE_SQLITE= 3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" HAVE_UNIX98=1
+CONFIGURE_ENV= HAVE_UNIX98=1
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= linuxsampler.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
.if defined(WITHOUT_JACK)
-CONFIGURE_ARGS+=--disable-jack-driver
+CONFIGURE_ARGS+=--disable-jack-driver
.else
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
.endif
@@ -66,7 +66,7 @@ BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi
RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi
PLIST_SUB+= DSSI=""
.else
-CONFIGURE_ENV+= ac_cv_header_dssi_h=no
+CONFIGURE_ENV+= ac_cv_header_dssi_h=no
PLIST_SUB+= DSSI="@comment "
.endif
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 1ddc3cec6c3f..45edc4f33fae 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -29,8 +29,8 @@ MAKE_JOBS_SAFE= yes
MAN1= liteamp.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 01cc4051bdd2..61a905dc9bb3 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -24,7 +24,7 @@ LICENSE= GPLv2
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
ALL_TARGET= all madtime
MAN1= abxtest.1 madplay.1
diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile
index 6762d76a6ac8..3e14227f6cca 100644
--- a/audio/mangler/Makefile
+++ b/audio/mangler/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-alsa
USE_LDCONFIG= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 804c39ac119f..7f97708ea5ba 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= gnomehack gtk20
WANT_GNOME= yes
WANT_SDL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-optimization --without-alsalib
PLIST_FILES= bin/mhwaveedit \
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index 986408e46c3c..905778509b61 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -25,7 +25,6 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --disable-alsatest --without-alsa
LICENSE= GPLv3
diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile
index 556422fc265f..e0b259a23fd2 100644
--- a/audio/mixmos/Makefile
+++ b/audio/mixmos/Makefile
@@ -16,8 +16,8 @@ COMMENT= A GTK2 audio mixer
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= mixmos.1
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 103862735ca7..e9bdc28c063c 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -18,12 +18,11 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= mocp.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= JACK "JACK support" off \
MP3 "MP3 support" on \
diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
index 5fa30840bd0b..d46bca3daecd 100644
--- a/audio/mp3_check/Makefile
+++ b/audio/mp3_check/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES= SF/mp3check/mp3check/${PORTVERSION}
MAINTAINER= ericb@thedeepsky.com
COMMENT= Verifies the integrity of mp3 audio files
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/mp3_check
.include <bsd.port.mk>
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 7a47eeeb8790..1d6737f92390 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -17,14 +17,13 @@ COMMENT= MP3 console ncurses-based player
USE_GMAKE= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-cxxflags="${CXXFLAGS}"
MAKE_JOBS_SAFE= yes
MAN1= mp3blaster.1 nmixer.1 splay.1
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
OPTIONS= LIRC "LIRC support" off \
SIDPLAY "Sidplayer support" on \
diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index eb476f94a5ee..1be756156e47 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -22,15 +22,14 @@ OPTIONS= GD "Enable support for GD library" on \
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \
--with-boost-thread=boost_thread
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/${PORTNAME}
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index cb473d5ec406..a3529af19732 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= mp3splt:${PORTSDIR}/audio/libmp3splt \
USE_AUTOTOOLS= libltdl
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-audacious --with-mp3splt=${LOCALBASE} --with-mp3splt-includes=${LOCALBASE}/include --with-mp3splt-libraries=${LOCALBASE}/lib --disable-mp3splttest
MAN1= mp3splt-gtk.1
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 7ca59c1eca10..51d769177d54 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS= mp3splt:${PORTSDIR}/audio/libmp3splt
USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-oggsplt_symlink --disable-mp3splttest
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index f5557b2c1a8c..feba36790313 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -22,8 +22,6 @@ GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PORTDOCS= AUTHORS README NEWS
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 26bb94195010..2e2e08ec6886 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -25,8 +25,9 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-optimization=0 \
--with-audio=oss \
--with-default-audio=oss
-CONFIGURE_ENV= CONFIG_SHELL=${SH} CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CONFIG_SHELL=${SH}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= mpg123.1
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index f8a1e70f04da..bd0e14949047 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -31,8 +31,8 @@ MPG321_SCROBBLER_PLUGIN_NAME?= 321
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-mpg123-symlink
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
MAN1= mpg321.1
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 3b3e7a09a781..0bde42fbd6c0 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= aclocal automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv"
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
.include <bsd.port.pre.mk>
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 4fb98f5d3eba..921434535078 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -32,8 +32,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= muine.schemas
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 5824ff5e2a55..344de13d744f 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -23,11 +23,10 @@ USE_GETTEXT= yes
USE_GMAKE= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
OPTIONS= X11 "Build with X11 support" on \
MP3 "Build with MP3 support" on \
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 234cae1f4fa8..ade54ec00587 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
USE_GNOME= gnomehack gnomeprefix libglade2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# do not conflict with audio/musicbox
CONFIGURE_ARGS= --program-suffix=-tag-editor
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index f418221d9d55..942a34b7bdfd 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE= yes
USE_GNOME= glib20
USE_RC_SUBR= ${PORTNAME}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${PREFIX}/include
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index ac470234abe0..ed413c551259 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient
GNU_CONFIGURE= yes
USE_GNOME= glib20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= NLS "Native language support" on \
LYRICS "Compile with lyrics screen" on
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 93fa743ed4c7..d3a462d66332 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -24,8 +24,8 @@ USE_NCURSES= yes
USE_GNOME= glib20
USE_AUTOTOOLS= automake aclocal libtool
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lpthread"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN1= ncmpcpp.1
MAKE_JOBS_SAFE= yes
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 31b5ae296d50..fc99f6d67d60 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-helper-search
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= normalize.1 normalize-mp3.1
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index 7944ca9dac3f..b86813b22c91 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -18,8 +18,7 @@ COMMENT= A player for NES Sound Format (NSF)
USE_GMAKE= yes
MAKE_ENV= INSTALL="${INSTALL}" COPY="${COPY}" STRIP="${STRIP}"\
- BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}"\
- LDFLAGS="${LDFLAGS}"
+ BINGRP="${BINGRP}" BINMODE="${BINMODE}" BINOWN="${BINOWN}"
PLIST_FILES= bin/nosefart
pre-build:
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 4bbd86026d16..dbcde6452bd7 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -33,13 +33,8 @@ WANT_GNOME= desktopfileutils
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -L${LOCALBASE}/lib
-CXXFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CFLAGS+= -L${LOCALBASE}/lib ${CPPFLAGS}
+CXXFLAGS+= -L${LOCALBASE}/lib ${CPPFLAGS}
CONFIGURE_ARGS= --with-dir-suffix="" \
--without-alsa \
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index ad065d0adf78..b76854dcfed3 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -29,7 +29,7 @@ OPTIONS= PULSEAUDIO "Enable sound streaming using PulseAudio" off
.if defined(WITH_PULSEAUDIO)
LIB_DEPENDS+= pulse-simple.0:${PORTSDIR}/audio/pulseaudio
CFLAGS+= -Iinclude -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CMAKE_ARGS+= -DPULSEAUDIO:BOOL=ON
.else
CMAKE_ARGS+= -DPULSEAUDIO:BOOL=OFF
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 1988cceccaef..f5ef3db839d8 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -19,7 +19,8 @@ CONFLICTS= openal-soft-[0-9]*
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-capture
USE_GMAKE= yes
USE_GNOME= pkgconfig gnomehack
diff --git a/audio/orpheus/Makefile b/audio/orpheus/Makefile
index c253162f41fe..567c2d0ba7d6 100644
--- a/audio/orpheus/Makefile
+++ b/audio/orpheus/Makefile
@@ -24,7 +24,7 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= NLS "Native language support" on \
CDDB "CDDB audio CD' auto fetch track info support" on \
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index ac021f6e347f..d299fd420bd3 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
GNU_CONFIGURE= yes
CFLAGS+= -fPIC -DPIC
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-all
USE_LDCONFIG= yes
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index fc3b40717117..e8537ff94558 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -24,14 +24,13 @@ USE_TK_BUILD= yes
USE_TK_WRAPPER= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKEFILE= makefile
MAKE_JOBS_UNSAFE= yes
MAN1= pd.1 pdreceive.1 pdsend.1
-CPPFLAGS= -I${TCL_INCLUDEDIR}
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${TCL_INCLUDEDIR}
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/audio/pidgin-musictracker/Makefile b/audio/pidgin-musictracker/Makefile
index 01b6cd0aea78..f7780abe08a3 100644
--- a/audio/pidgin-musictracker/Makefile
+++ b/audio/pidgin-musictracker/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= "CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index 9fbd73ccffd9..06f0c37e6b72 100644
--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@@ -28,8 +28,8 @@ CFLAGS+= -O0
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= LIBS="${LDFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}" LIBS="${LDFLAGS}" CFLAGS="${CFLAGS}"
+MAKE_ENV+= LIBS="${LDFLAGS}"
+CONFIGURE_ENV+= LIBS="${LDFLAGS}"
PLIST_FILES= bin/playgsf
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index e8ba7485fc3d..7ae359fb6ac2 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= glib20
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/${PORTNAME}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 621e1d6a241f..60b9bbd91a71 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -19,8 +19,8 @@ USE_LDCONFIG= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= MKDIR="${MKDIR}" \
OSVERSION=${OSVERSION}
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 6ac9afc12d6e..8057703cedb0 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -34,13 +34,13 @@ GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
OPENSSL_CFLAGS="-I/usr/include" \
OPENSSL_LIBS="-lcrypto -lssl" \
LIBS="-lm -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=/var \
--with-database=gdbm \
diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile
index e662d165eeb8..46ebaa67dd3c 100644
--- a/audio/py-pyliblo/Makefile
+++ b/audio/py-pyliblo/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= lo.7:${PORTSDIR}/audio/liblo
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
- LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= dump_osc.1 send_osc.1
diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile
index 9a996384a452..281a5263842c 100644
--- a/audio/q-audio/Makefile
+++ b/audio/q-audio/Makefile
@@ -28,6 +28,5 @@ DATADIR= ${PREFIX}/share/q
CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index 7dc178f1c5de..e4caf5b4c829 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321 \
flac:${PORTSDIR}/audio/flac
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="`fltk-config --ldflags`"
+LDFLAGS+= `fltk-config --ldflags`
USE_GMAKE= yes
USE_GNOME= glib20
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index 2903cd9d1e85..6dec765b48f1 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= FOX-1.4:${PORTSDIR}/x11-toolkits/fox14
USE_BISON= build
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-alsa
OPTIONS= LARGEFILE "Enable 64-bit I/O support (not yet!)" off \
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 500823bc373e..e9912b3ee580 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -41,9 +41,10 @@ CONFIGURE_ARGS= --disable-vala --with-libbrasero-media \
--without-libnautilus-burn
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= LIBS="-lm" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV= LIBS="-lm"
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= rhythmbox.schemas
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index e6a902843b15..4bc0fc8d0577 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -17,13 +17,12 @@ COMMENT= A program to inferface with the Rio600, Rio800, and psa[play devices
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= rioutil.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index e7669bf8b235..b039c6ced9a8 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -32,7 +32,7 @@ QT_COMPONENTS= gui xml network corelib sql qt3support \
rcc_build moc_build uic_build linguist_build
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= QTLIBDIR=${QT_LIBDIR} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= QTLIBDIR=${QT_LIBDIR}
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
INSTALLS_ICONS= yes
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 313ef8bdde1d..926ef506c6cd 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= rplay.1 rptp.1
MAN5= rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplay.servers.5
diff --git a/audio/ruby-xmms/Makefile b/audio/ruby-xmms/Makefile
index 927c1d77c29e..3a337f016d65 100644
--- a/audio/ruby-xmms/Makefile
+++ b/audio/ruby-xmms/Makefile
@@ -26,7 +26,9 @@ INSTALL_TARGET= site-install
DOCS= AUTHORS COPYING ChangeLog README doc
-CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-install:
.if !defined(NOPORTDOCS)
diff --git a/audio/schism/Makefile b/audio/schism/Makefile
index 4cfaa4febd14..cda88e196462 100644
--- a/audio/schism/Makefile
+++ b/audio/schism/Makefile
@@ -22,11 +22,6 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-
LICENSE= GPLv2
PLIST_FILES= bin/${PORTNAME}
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index 57f9a5d5f037..e7f2805eb5b5 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -24,7 +24,8 @@ CONFLICTS= bmp-scrobbler-[0-9]* \
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SLAVEDIRS= audio/xmms-scrobbler audio/bmp-scrobbler
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 6fa1868c9e7a..789b0c9fea13 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -20,9 +20,9 @@ USE_SDL= sdl
USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -DCONFIG_FILE_ETC_TIMIDITY=\"${LOCALBASE}/etc/timidity.cfg\"
USE_LDCONFIG= yes
OPTIONS= MIKMOD "Enable MOD music via libMikMod" On \
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index de26ec62d0ac..5811f72f8299 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -19,7 +19,8 @@ COMMENT= A SDL audio library and player for some popular sound file formats
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_SDL= sdl
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= FLAC "Enable FLAC decoding support" on \
MIKMOD "Enable MOD decoding support using mikmod" on \
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index 830abf78d7f0..d917c44cba8a 100644
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -22,11 +22,6 @@ MAKE_JOBS_SAFE= yes
SDLINCLUDEDIR= SDL
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-
LICENSE= GPLv2
post-patch:
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index fe6b1322d9b5..1c660af5ffa4 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_ARGS= --with-wx-config=${LOCALBASE}/bin/wxgtk2-2.8-config
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index b67e54b7677a..b7276277c5eb 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -26,7 +26,6 @@ OPTIONS= ESD "Use Enlightened Sound Daemon" on \
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-float-samples
MAKEFILE= makefile
ALL_TARGET= audinfo snd snd-info sndplay
@@ -35,8 +34,8 @@ MAKE_JOBS_UNSAFE= yes
MAN1= snd.1
CFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 438bb154dc80..2577f7c8516c 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -33,8 +33,8 @@ USE_GSTREAMER= cdparanoia vorbis flac gconf good gio
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ignore-missing-cd
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= sound-juicer.1
GCONF_SCHEMAS= sound-juicer.schemas
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 7bb82811c120..83fec706b8e6 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile
USE_GNOME= esound gdkpixbuf gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= GNOME "use GNOME 1.x (enables envelope editors)" off \
I386_ASM "i386 asm optimizations (potentially unstable)" off \
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 7229e4ddd5c0..7b992ba99497 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -54,7 +54,6 @@ OPTIONS= ALSA "ALSA output driver" off \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 3a8af4b84771..e9a3807accaa 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= speexdec.1 speexenc.1
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index 2a293443d7bf..a6877c2ba311 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -19,8 +19,8 @@ USE_LDCONFIG= yes
USE_GMAKE= yes
USE_AUTOTOOLS=libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= MKDIR="${MKDIR}" \
OSVERSION=${OSVERSION}
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 1fa33b31ede9..1828081f8526 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= MKDIR="${MKDIR}" \
OSVERSION=${OSVERSION}
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index e55ac7078fbb..55f6898f8ac1 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -24,8 +24,8 @@ USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
.if defined(WITH_OPTIMIZED_CFLAGS)
CFLAGS+= -O3 -ffast-math
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index b64114b05c65..9368b99ab2d9 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -29,7 +29,6 @@ LICENSE= GPLv2
USE_GNOME= glib20
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-included-libmad \
--without-included-tre \
--with-included-argv \
@@ -39,8 +38,8 @@ MAN1= streamripper.1
PLIST_FILES= bin/streamripper
CFLAGS+= -DANSI_PROTOTYPES
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
CDK_VERSION= 5.0-20060507
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index bde7d2fd87b9..2a4351690ba8 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \
mp3lame:${PORTSDIR}/audio/lame
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/streamTranscoder
PORTDOCS= AUTHORS README
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 589a7b12ea30..b3954bf77e57 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -23,9 +23,8 @@ USE_GNOME= gtk20 gnomehack gnomeprefix
USE_GMAKE= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= SHOUTCAST "SHOUTcast plugin" on \
LIVE365 "Live365 plugin" on \
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 701bc86e0ded..c8178a6644d5 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomehack gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
--with-extraincdir=${LOCALBASE}/include \
--with-vorbis-libraries=${LOCALBASE}/lib \
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 2326b384cd83..4ac8098ce809 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -25,9 +25,8 @@ ONLY_FOR_ARCHS= i386 amd64
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
CFLAGS+= -fPIC -DPIC
diff --git a/audio/tagger/Makefile b/audio/tagger/Makefile
index 9d0f098c0479..463cb192274f 100644
--- a/audio/tagger/Makefile
+++ b/audio/tagger/Makefile
@@ -18,8 +18,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/tagger
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 699a117585d1..75256cd798dc 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -22,11 +22,10 @@ USE_GNOME= gnomehack intlhack libglade2
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 97fb5711aa3e..4af5303933c8 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -34,7 +34,6 @@ USE_GNOME= gnomehack gnomehier gtk20 libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-alsa \
--disable-alsamidi \
--disable-scheduler
@@ -42,8 +41,8 @@ INSTALLS_OMF= yes
MAN1= terminatorX.1
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index b41812415679..7214088b3bb0 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -40,7 +40,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*' \
CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \
--program-transform-name= --enable-network
CPPFLAGS+= -I${LOCALBASE}/include/libarc
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS=-export-dynamic
+LDFLAGS+= -export-dynamic
DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf
DOCLANG= C ja_JP.eucJP
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
index 6ac79d078d9c..0eeb8bc0589d 100644
--- a/audio/timidity++/Makefile.interface
+++ b/audio/timidity++/Makefile.interface
@@ -25,7 +25,7 @@ PKGMESSAGE= ${NONEXISTENT}
.endif
CONFIGURE_ENV+= SHLD="${CC} -shared ${LDFLAGS}"
-LDFLAGS= -export-dynamic
+LDFLAGS+= -export-dynamic
CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index b9872371d7c6..48a30440e4da 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -16,7 +16,8 @@ COMMENT= A MIDI library
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-doc-install
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index 0b94be5f15c8..433d71207cba 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -22,13 +22,12 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libaiff.a:${PORTSDIR}/audio/libaiff
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/${PORTNAME}
MAN1= ${PORTNAME}.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index bb856dd9bf0b..cfb8aef8c569 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -34,8 +34,8 @@ OPTIONS= DBUS "Build with DBUS support" on \
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index e64372167b32..2e795460f53f 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -23,10 +23,10 @@ LIB_DEPENDS= ao.4:${PORTSDIR}/audio/libao \
vorbis.4:${PORTSDIR}/audio/libvorbis
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
.if !defined(WITHOUT_NLS)
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
index 3aab50d6d5f5..f5246f9f96cc 100644
--- a/audio/vorbisgain/Makefile
+++ b/audio/vorbisgain/Makefile
@@ -18,8 +18,8 @@ COMMENT= Calculates the perceived sound level of an Ogg Vorbis file
LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= vorbisgain.1
PLIST_FILES= bin/vorbisgain
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index d47088cab255..79a93ac01873 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -18,9 +18,9 @@ OPTIONS= PULSE "Pulseaudio soundserver support" OFF
USE_GNOME= gnomehack gtk20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+CONFIGURE_ENV= PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-alsa
INSTALLS_ICONS= yes
diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index 92f23817a255..33c18584a16a 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -20,8 +20,6 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
OPTIONS= MMX "Enable MMX optimizations (x86 only)" Off
diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile
index 9595584c4e3f..307d6746099c 100644
--- a/audio/whysynth/Makefile
+++ b/audio/whysynth/Makefile
@@ -27,9 +27,8 @@ USE_BZIP2= yes
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 8b87555e940a..51edf6882143 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -25,7 +25,7 @@ USE_AUTOTOOLS= libtool
WANT_GNOME= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/WINGs"
+CPPFLAGS+= -I${LOCALBASE}/include/WINGs
CONFIGURE_ARGS+=--x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib \
--with-libs-from=-L${LOCALBASE}/lib \
diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile
index 4d84ddc7c6d4..4f1dc1c778e7 100644
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -21,7 +21,8 @@ GNU_CONFIGURE= yes
USE_WX= 2.8+
WX_UNICODE= yes
CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/wxGuitar
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index bfaa99342bb1..26e4b4e47e4e 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -26,7 +26,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= GPLv2
diff --git a/audio/xmms-audiofile/Makefile b/audio/xmms-audiofile/Makefile
index 02c7139ffa26..930e026575e1 100644
--- a/audio/xmms-audiofile/Makefile
+++ b/audio/xmms-audiofile/Makefile
@@ -24,8 +24,8 @@ USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" \
- LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS}"
+CFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/audio/xmms-cdread/Makefile b/audio/xmms-cdread/Makefile
index d56b42940961..258dfd6bb0f8 100644
--- a/audio/xmms-cdread/Makefile
+++ b/audio/xmms-cdread/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= lib/xmms/Input/libcdread.so lib/xmms/Input/libcdread.la
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 267613091bcf..78f35274691e 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+= --enable-player=${APP}
LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--enable-samplerate
.endif
diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile
index 79141417cd07..3fe67217234a 100644
--- a/audio/xmms-fc/Makefile
+++ b/audio/xmms-fc/Makefile
@@ -25,15 +25,14 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- ac_cv_lib_fc14audiodecoder_fc14dec_new=yes
+CONFIGURE_ENV= ac_cv_lib_fc14audiodecoder_fc14dec_new=yes
CONFIGURE_ARGS= --disable-gtktest
USE_LDCONFIG= yes
PLIST_FILES= lib/xmms/Input/fcdecoder.so lib/xmms/Input/fcdecoder.la
-CPPFLAGS= -I${WRKDIR}/${LIBFC_DISTNAME}/src
-LDFLAGS= -L${WRKDIR}/${LIBFC_DISTNAME}/src/.libs -lstdc++
+CPPFLAGS+= -I${WRKDIR}/${LIBFC_DISTNAME}/src
+LDFLAGS+= -L${WRKDIR}/${LIBFC_DISTNAME}/src/.libs -lstdc++
LIBFC_PORTNAME= libfc14audiodecoder
LIBFC_PORTVERSION= 1.0.2
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index e462117a49b7..855256a94b8d 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -22,12 +22,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gtk12
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= lib/xmms/Output/libjackout.so
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 36e5f302449a..8e43c8b5a337 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -21,12 +21,11 @@ USE_BZIP2= yes
USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= lib/xmms/Input/libxmmsmad.so
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
do-install:
cd ${WRKSRC}/src/.libs \
diff --git a/audio/xmms-mp3cue/Makefile b/audio/xmms-mp3cue/Makefile
index ebc8a6c88310..5f6fbe2a07f3 100644
--- a/audio/xmms-mp3cue/Makefile
+++ b/audio/xmms-mp3cue/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB= PORTDOCS=${DISTNAME}
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+= -fPIC
.endif
post-patch:
diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
index 479a2f0d17e0..f7bd43f4c780 100644
--- a/audio/xmms-wavpack/Makefile
+++ b/audio/xmms-wavpack/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= wavpack.2:${PORTSDIR}/audio/wavpack \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
post-install:
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 0c0ea610aa35..7c43c5f8bd92 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -23,7 +23,8 @@ USE_GNOME= gtk12
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
PLIST_FILES= lib/xmms/Input/libxymms.a \
lib/xmms/Input/libxymms.la \
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index b92d75dbe53c..4eb864028108 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 \
curl.6:${PORTSDIR}/ftp/curl
USE_GMAKE= yes
-MAKE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
PLIST_FILES= bin/xmms2-scrobbler
PORTDOCS= README
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index 2d5c1c8042f1..b0b4dc238125 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -25,9 +25,8 @@ LICENSE_COMB= multi
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 95dcb4b8df65..0f8f149bf8b9 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -19,8 +19,8 @@ COMMENT= Yet Another Mp3 Tool which helps you to organize your mp3s
USE_GMAKE= yes
USE_GNOME= gnomelibs gnomehack gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 6e1f98b89993..6b57c0405e30 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -24,11 +24,10 @@ USE_PERL5= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-ipv6
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/benchmarks/forkbomb/Makefile b/benchmarks/forkbomb/Makefile
index 6e956de468d6..7d60cd05a914 100644
--- a/benchmarks/forkbomb/Makefile
+++ b/benchmarks/forkbomb/Makefile
@@ -15,9 +15,6 @@ MASTER_SITE_SUBDIR= system/benchmark
MAINTAINER= ports@FreeBSD.org
COMMENT= System stress testing tool
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-
MAN8= forkbomb.8
PLIST_FILES= sbin/forkbomb
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index ffd773c5a1b4..29a776c839b5 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gtk20 gnomeprefix
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
USE_ICONV= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index aee53c1cb235..72fde403861f 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -34,7 +34,7 @@ OPTIONS= THREADS "Enable threading (uses pthreads)" on \
.if defined (WITH_THREADS)
CFLAGS+= ${PTHREAD_CFLAGS}
-MAKE_ENV= LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
.else
CFLAGS+=-DNO_THREADS
.endif
diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index de7215bd9ca5..00a9795cee6c 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.if defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --disable-threads
.else
-CONFIGURE_ENV+= CFLAGS+=${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_LIBS}
.endif
post-install:
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 44adb235b06c..e3e318255ea3 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= as@bsdgroup.de
COMMENT= A benchmarking tool for Web proxies
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
+CPPFLAGS+= -Wno-deprecated
CONFIGURE_ARGS+=--datadir=${DATADIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile
index e1263f8b1637..e50dbe89ec26 100644
--- a/benchmarks/polygraph31/Makefile
+++ b/benchmarks/polygraph31/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= adrian@FreeBSD.org
COMMENT= A benchmarking tool for Web proxies
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
+CPPFLAGS+= -Wno-deprecated
CONFIGURE_ARGS+=--datadir=${DATADIR}
WRKSRC= ${WRKDIR}/${PORTNAME:S/31//}-${PORTVERSION}
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index da69452a0941..55264b56a87e 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -39,6 +39,5 @@ CONFIGURE_ARGS+= --disable-openssl
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.include <bsd.port.post.mk>
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index 3d4b8de7fd09..12c7c8eb8a24 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -22,8 +22,8 @@ MAN1= sipp.1
USE_GMAKE= yes
CPP= ${CXX}
-MAKE_ENV+= CPPFLAGS="${CXXFLAGS}" \
- CCLINK="${CXX}"
+MAKE_ENV+= CCLINK="${CXX}"
+CPPFLAGS+= ${CXXFLAGS}
WRKSRC= ${WRKDIR}/sipp.svn
OPTIONS= OPENSSL "OpenSSL support (for digest auth and SIP over TLS)" on \
diff --git a/benchmarks/webbench/Makefile b/benchmarks/webbench/Makefile
index e3d16250cc1e..8fc6154cabc1 100644
--- a/benchmarks/webbench/Makefile
+++ b/benchmarks/webbench/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR= apps/www/servers
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple forking web benchmark
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
MAKE_ARGS+= CFLAGS="${CPPFLAGS} ${CFLAGS}"
.if !defined(NO_INSTALL_MANPAGES)
diff --git a/biology/crux/Makefile b/biology/crux/Makefile
index f483a50b21ef..3a464a488e6f 100644
--- a/biology/crux/Makefile
+++ b/biology/crux/Makefile
@@ -27,7 +27,6 @@ OPTIONS= SYS_LINALG "Enable system ATLAS/LAPACK" Off
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_FORTRAN= yes
.if defined(WITH_SYS_LINALG)
CONFIGURE_ARGS+= --enable-sys-linalg
diff --git a/biology/embassy/Makefile b/biology/embassy/Makefile
index 09156c4a5bd6..41d1b14baf4b 100644
--- a/biology/embassy/Makefile
+++ b/biology/embassy/Makefile
@@ -46,8 +46,10 @@ OPTIONS= DOMAINATRIX "Protein domain apps" on \
IPRSCAN "InterPro scan" on \
CBSTOOLS "CBS Tools" on
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/emboss/include" \
- LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${LOCALBASE}/emboss/lib"
+CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/emboss/include
+LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib -L${LOCALBASE}/emboss/lib
+
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
EMBASSY_WRKDIR= ${WRKSRC}/EMBASSY
DOMAINATRIX_VERSION= 0.1.0
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index b51e1710f55c..20eb7487a319 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -22,12 +22,11 @@ USE_GMAKE= yes
USE_AUTOTOOLS= aclocal automake autoconf libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MOPAC_SUBVERSION= 1.11
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 102dd98a43e8..3fc6b7680a23 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -27,8 +27,6 @@ CONFIGURE_ARGS+= --without-irix_mipspro_mpi
CPPFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}"
-
WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS= GLUT "Use glut" on
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index e95f483367cb..7743131b468e 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ENV= QTINCDIR="${LOCALBASE}/include" \
- QTLIBDIR="${LOCALBASE}/lib" \
- LDFLAGS="${LDFLAGS} -lm"
+ QTLIBDIR="${LOCALBASE}/lib"
+LDFLAGS+= -lm
MAKE_ARGS+= LDFLAGS+="-lqt-mt ${PTHREAD_LIBS}"
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 61d82fee7658..751c0e4831c5 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -34,8 +34,7 @@ USE_GNOME= gnomehack
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.5\
-I${LOCALBASE}/include/tk8.5 -I${LOCALBASE}/include/tnt
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- TKINCDIR=${LOCALBASE}/include/tk8.5
+CONFIGURE_ENV+= TKINCDIR=${LOCALBASE}/include/tk8.5
CONFIGURE_ARGS+=--with-libs="-lpng ${EXTRA_LIBS}" --program-transform-name="" \
--x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs \
--disable-jove-build --disable-strict-build --disable-warnings \
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index 16a6e27adad4..2b4692b58bae 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -30,8 +30,8 @@ USE_GMAKE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-docdir="${DOCSDIR}" --disable-update-mime-database \
--disable-update-desktop-database
-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/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index d7610d245772..8a687d3025ef 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -31,8 +31,8 @@ INSTALLS_ICONS= yes
CONFIGURE_ARGS= --enable-gdgeda --with-docdir=${DOCSDIR} \
--disable-update-mime-database \
--disable-update-desktop-database
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gschem.1
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index bfaddace1a3d..725adfb549f9 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -27,8 +27,8 @@ DOCSDIR= ${PREFIX}/share/doc/geda
GNU_CONFIGURE= yes
USE_GNOME= gtk20
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gnetlist.1
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 8c2e9cbb0830..dec427e0d850 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -22,8 +22,8 @@ DOCSDIR= ${PREFIX}/share/doc/geda
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index cea6d790b9b3..bdd264420196 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -27,8 +27,8 @@ DATADIR= ${PREFIX}/share/geda
GNU_CONFIGURE= yes
USE_GNOME= gtk20
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gsymcheck.1
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index d50982819ac0..7b5f22f8ca6d 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -30,8 +30,8 @@ USE_GNOME= gtk20
USE_PERL5_RUN= yes
USE_PYTHON_RUN= yes
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= grenum.1
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index f8f5df45803e..2c7424817f2a 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -19,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= desktopfileutils gnomehack gtk20
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -27,8 +26,8 @@ PLIST_SUB= VERSION="${PORTVERSION}"
MAN1= gerbv.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s|desktop||g' ${WRKSRC}/Makefile.in
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index af82d22b5e01..7bc867d98029 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile \
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
OPTIONS= PLOTUTILS "Use GNU plotutils for plotting" off \
GNUPLOT "Use gnuplot for plotting" on \
diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index edfccb701ac1..2fbf79fc6fd0 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/scripts/
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= PIC_CFLAGS="-fpic" LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV+= PIC_CFLAGS="-fpic" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
OPTIONS= SCHEME "Enable built-in Scheme interpreter" on \
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index fdc1361c5956..4b0f60498bac 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -25,8 +25,8 @@ USE_GNOME= gtk20 gnomehack
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-update-mime-database \
--disable-update-desktop-database
-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/cad/magic/Makefile b/cad/magic/Makefile
index 2d90d6fc83f1..c9a2fd274cb6 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -27,7 +27,6 @@ USE_TCL= yes
USE_TK= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
ALL_TARGET= tcllibrary
MAKE_JOBS_UNSAFE=yes
@@ -36,8 +35,8 @@ MAN1= ext2sim.1 ext2spice.1 extcheck.1 magic.1
MAN5= cmap.5 displays.5 dlys.5 dstyle.5 ext.5 glyphs.5 mag.5 \
net.5 sim.5
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index ffbcffb1421c..d0d1e7cfd986 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -27,7 +27,6 @@ USE_XORG= xmu xi
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${TK_LIBDIR}/Togl-1.7
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} --enable-jpeglib
FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git a/cad/opencascade-tutorial/Makefile b/cad/opencascade-tutorial/Makefile
index 6bd797865167..7c6b4c96ff12 100644
--- a/cad/opencascade-tutorial/Makefile
+++ b/cad/opencascade-tutorial/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-gl-include=${LOCALBASE}/include \
--with-qt-dir=${QTDIR} \
--enable-qt-mt \
--with-cascade-dir=${CASROOT}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
WRKSRC= ${WRKDIR}/opencascade-${PORTVERSION}/samples/tutorial
CONFIGURE_LOG= adm/${OPSYS}/config.log
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index b19a6c0e4551..b6a1cc3987a4 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -65,8 +65,9 @@ CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-stlport-libname=stlport_${STL_COMPILER} \
--with-stlport-library=${LOCALBASE}/lib \
--enable-production=yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include \
- -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" ARCH=${ARCH} LD=${CXX}
+CONFIGURE_ENV= ARCH=${ARCH} LD=${CXX}
+CPPFLAGS+= ${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include \
+ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
# We strip the libs
MAKE_ENV= INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}" \
OCC_INSTALLDIR="${OCCROOT}" PTHREAD_LIBS="${PTHREAD_LIBS}" LD=${CXX}
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index aa486d118846..d2edcaaa24d9 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -24,9 +24,9 @@ USE_AUTOTOOLS= autoconf
USE_GMAKE= yes
USE_TK_RUN= 83
INSTALLS_ICONS= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
- INSTALL_DATA="/usr/bin/install ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}"
+CONFIGURE_ENV+= INSTALL_DATA="/usr/bin/install ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CONFIGURE_ARGS= --docdir=${DOCSDIR} --disable-nls
PORTDOCS= pcb.html pcb.ps refcard.ps pcb.pdf refcard.pdf pad.gif \
puller.gif thermal.gif pad.png puller.png thermal.png examples \
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index 420b57caa2b2..f7fd798c60f3 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -292,7 +292,7 @@ PLIST_SUB+= MPI="@comment "
.endif
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CXXFLAGS="${QSCIFLAGS} ${QTFLAGS} ${CXXFLAGS} " CPPFLAGS="${CPPFLAGS}"
+CXXFLAGS+= ${QSCIFLAGS} ${QTFLAGS}
.include <bsd.port.pre.mk>
diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile
index fb37fcdfb7b4..266c94f5281f 100644
--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@@ -16,8 +16,8 @@ COMMENT= Show you font info and add new 'name' and 'cmap' tables
USE_ICONV= yes
GNU_CONFIGURE= YES
USE_GMAKE= YES
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv"
post-patch:
@${FIND} ${WRKSRC}/src/ -type f -print0 | \
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index fdd017bba3fe..c35dc86b4d57 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -29,8 +29,6 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -liconv
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--disable-bimsphone-module \
--disable-static \
--with-conf-dir=${PREFIX}/etc/${PORTNAME} \
@@ -75,7 +73,7 @@ PLIST_SUB+= UNICODE="@comment "
# TODO WITHOUT_NLS knob
#.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -lintl"
+LDFLAGS+= -lintl
PLIST_SUB+= NLS=""
#.else
#CONFIGURE_ARGS+=--disable-nls
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 2c88fa571f8a..e402de7b174f 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -35,7 +35,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/chinese/qterm/Makefile b/chinese/qterm/Makefile
index a889e47e8dbb..77fb5c7ab8fa 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -20,7 +20,7 @@ USE_PERL5_BUILD=yes
USE_QT_VER= 3
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_PYTHON)
USE_PYTHON= 2.5+
diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile
index 376edfe9fbd6..ca765b5bd993 100644
--- a/chinese/scim-array/Makefile
+++ b/chinese/scim-array/Makefile
@@ -25,7 +25,6 @@ USE_ICONV= yes
CFLAGS+= -fPIC
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
pre-configure:
@${REINPLACE_CMD} -e "s,@SCIM_MODULEDIR@,$$(pkg-config --variable=moduledir scim | ${SED} -e s,`pkg-config --variable=prefix scim`,${PREFIX},)," ${WRKSRC}/src/Makefile.in
diff --git a/chinese/scim-chewing/Makefile b/chinese/scim-chewing/Makefile
index 9116c8990e39..65a032ac7b06 100644
--- a/chinese/scim-chewing/Makefile
+++ b/chinese/scim-chewing/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= intltool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-D__STDC_ISO_10646__ -I${LOCALBASE}/include"
+CPPFLAGS+= -D__STDC_ISO_10646__ -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e 's,@DATADIRNAME@,share,g' ${WRKSRC}/po/Makefile.in.in
diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile
index 3c96bf311dc7..117e7385c246 100644
--- a/chinese/scim-fcitx/Makefile
+++ b/chinese/scim-fcitx/Makefile
@@ -26,10 +26,10 @@ MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/fcitx
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+= SCIM_DATADIR=${PREFIX}/share/scim \
SCIM_ICONDIR=${PREFIX}/share/scim/icons
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
SUB_FILES= pkg-message
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index 9f242317234e..0c81a0d51481 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -23,9 +23,10 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
.include <bsd.port.pre.mk>
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index c293e9ce8a90..ec9b0c4c7b60 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -23,9 +23,9 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+= SCIM_DATADIR=${PREFIX}/share/scim \
SCIM_ICONDIR=${PREFIX}/share/scim/icons
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --disable-skim-support
diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index b4f4449933f9..c1e3288b2e78 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -19,8 +19,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for the Chinese people to study foreign language
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 14489675d565..eff4404600f2 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -22,8 +22,8 @@ USE_ICONV= yes
# Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
USE_GETTEXT= yes
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 33fe1d9e3a88..07b1b0ce9ff4 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -15,8 +15,8 @@ COMMENT= Remote control service over Bluetooth, infrared or tcp/ip networking
USE_GNOME= glib20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= GPLv2
diff --git a/comms/bforce/Makefile b/comms/bforce/Makefile
index 77a887d7d8f4..536f17348fe3 100644
--- a/comms/bforce/Makefile
+++ b/comms/bforce/Makefile
@@ -17,7 +17,7 @@ COMMENT= Simple ifcico like Fidonet technology mailer
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-builtin"
+CFLAGS+= -fno-builtin
WRKSRC= ${WRKDIR}/${DISTNAME}/source
SUB_FILES= pkg-message
diff --git a/comms/dfu-programmer/Makefile b/comms/dfu-programmer/Makefile
index f7b12b9899bc..3d34308a45b0 100644
--- a/comms/dfu-programmer/Makefile
+++ b/comms/dfu-programmer/Makefile
@@ -14,7 +14,8 @@ MAINTAINER= elbarto@ArcadeBSD.org
COMMENT= Device Firmware Update based USB programmer for Atmel chips
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
PLIST_FILES= bin/dfu-programmer
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 25ce6693b523..98fd21ac5a18 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -33,7 +33,6 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-gtk-version=gtk2
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 6b304e91249c..1635111e2521 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gconf gnomeprint
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= halifax.1 ghfaxviewer.1
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 836954861f6f..b544498199c8 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
GNU_CONFIGURE= yes
# This is pure evil but it looks like autoconf 2.53 has a bug in linking the
# preprocessor include tests. The following line is a work around.
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
USE_GNOME= libgnomeui gnomehack gnomeprefix
INSTALLS_OMF= yes
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index e57e3d246765..4b021568cff6 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= gnokii.7:${PORTSDIR}/comms/gnokii
USE_BZIP2= yes
USE_GNOME= gtk20 libglade2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= NLS "Build with Native Language Support" on
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 062b75cb4f98..3209b57de209 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -31,14 +31,14 @@ MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
USE_GNOME= intltool
GNU_CONFIGURE= yes
-CPPFLAGS= ${CFLAGS} -I${LOCALBASE}/include -fPIC
+CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fPIC
CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE} --enable-security \
--with-xgnokiidir=${PREFIX}/share
CONFIGURE_ENV+= MSGFMT="${LOCALBASE}/bin/msgfmt" \
XGETTEXT="${LOCALBASE}/bin/xgettext" \
- LDFLAGS="-L${LOCALBASE}/lib" \
LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \
PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES+= pkg-message
PORTDOCS= *
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 87302e8cba80..e61af00fa1da 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -40,8 +40,8 @@ USE_PERL5= yes
USE_AUTOTOOLS= autoconf libtool
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-include-dir="${LOCALBASE}/include/" \
--enable-grc \
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index cd18a4966e1b..972de6a56626 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -21,7 +21,6 @@ COMMENT= A library to access GSM mobile phones through GSM modems
USE_GNOME= lthack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= gsmctl.1 gsmpb.1 gsmsendsms.1 gsmsmsstore.1
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 63fde84e76c2..f97352724056 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -21,7 +21,8 @@ USE_TCL= yes
USE_PYTHON= yes
USE_AUTOTOOLS= autoconf libtool libltdl
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-perl-binding \
--enable-tcl-binding --with-tcl=${TCL_LIBDIR} \
--with-python-binding --without-rigmatrix
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index df406228ff0c..18ec28b37942 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \
- USER_LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" USER_LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-debug=full
post-patch:
diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index aa1b95caaeba..2202386ed4d1 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \
USE_BZIP2= yes
USE_GNOME= glib20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index f01ea81289ec..6bf54a51c152 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES= SF/tilp/OldFiles
MAINTAINER= tijl@coosemans.org
COMMENT= TI calculator link cables library
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index fe3ed98c342e..bd425d00d3cf 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -30,7 +30,6 @@ PLIST_SUB= NLS="@comment "
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index 806bc72f123b..2069c0fc9d94 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -33,6 +33,5 @@ PLIST_SUB= NLS="@comment "
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 2c48bc6b655f..00739dfc3d47 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-qtdir=${LOCALBASE} --prefix=${PREFIX}
SUB_FILES= pkg-message
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 961512241425..63ac54486b71 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_BZIP2= yes
ALL_TARGET= xlinrad
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 353e5908ddb6..3ba8eaf07df8 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -33,7 +33,6 @@ CONFIGURE_ARGS= --enable-sandboxed --with-devdir=/var/run/lirc \
--sysconfdir=${PREFIX}/etc
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
OPTIONS= MINIMAL "Build with minmal dependencies" Off \
DEBUG "Build debug version" Off
diff --git a/comms/nokryptia/Makefile b/comms/nokryptia/Makefile
index 90338cce6039..dc560313a10b 100644
--- a/comms/nokryptia/Makefile
+++ b/comms/nokryptia/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib
GNU_CONFIGURE= yes
USE_BZIP2= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= nokryptia.1
PLIST_FILES= bin/nokryptia
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index a2ad7f696abd..3347ce6043f5 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= lirc_client.2:${PORTSDIR}/comms/lirc
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
PLIST_FILES= %%PYTHON_SITELIBDIR%%/pylircmodule.so
USE_PYTHON= yes
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 6f6d1915a27f..b6e56bc14a87 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -19,9 +19,9 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= scmxx.1
MANLANG= "" ru de it
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index 5642bbc1b19e..113d6c9e4809 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/comms/tcpser/Makefile b/comms/tcpser/Makefile
index 6209a5421314..52d4dbb8a8ca 100644
--- a/comms/tcpser/Makefile
+++ b/comms/tcpser/Makefile
@@ -16,7 +16,7 @@ COMMENT= TCPSER turns serial port into an emulated Hayes compatible modem
WRKSRC= ${WRKDIR}/tcpser
USE_GMAKE= yes
CFLAGS+= ${PTHREAD_CFLAGS}
-MAKE_ENV+= LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
PORTDOCS= README CHANGES
PLIST_FILES= bin/tcpser
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index f84a44565494..d1e81811e7ff 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -35,7 +35,6 @@ PLIST_SUB= NLS="@comment "
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --without-kde
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= tilp.1
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index 95129f809f05..b3986ce42c1a 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS= autoconf libtool aclocal automake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
OPTIONS= HAMLIB "Use hamlib" ON
MAN1= tlf.1
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 7415ea64ecd9..dd1165fe3033 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_PERL5= yes
USE_WX= 2.6
USE_LDCONFIG= yes
-MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV= INCDIR="-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index d3ba4d8cf8c6..6c1473eb3f3a 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -31,8 +31,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gfortran --prefix=${LOCALBASE} \
--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
-CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_PYTHON= 2.5+
USE_AUTOTOOLS= libtool
PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3332f04d11ed..b9a382f83192 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gfortran --prefix=${LOCALBASE} \
--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
-CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_PYTHON= 2.5+
USE_AUTOTOOLS= libtool
PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index d2b2fb12e6f6..443f03174179 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -20,8 +20,6 @@ RUN_DEPENDS= nec2c:${PORTSDIR}/comms/nec2c
USE_GNOME= gtk20
USE_GMAKE= yes
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
-
MAN1= xnecview.1
PLIST_FILES= bin/xnecview
diff --git a/converters/ascii2binary/Makefile b/converters/ascii2binary/Makefile
index 43f4efb714da..09c284f8bcac 100644
--- a/converters/ascii2binary/Makefile
+++ b/converters/ascii2binary/Makefile
@@ -19,7 +19,8 @@ USE_GETTEXT= yes
LICENSE= GPLv3
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}
PLIST_FILES= bin/ascii2binary bin/binary2ascii
diff --git a/converters/cocot/Makefile b/converters/cocot/Makefile
index a9c8dda15318..de9372ee05ac 100644
--- a/converters/cocot/Makefile
+++ b/converters/cocot/Makefile
@@ -17,7 +17,8 @@ USE_BZIP2= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCS_EN= COPYING ChangeLog
DOCS_JA= ChangeLog.ja README.ja
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index db884d4f4cdb..9ffc78353c86 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= enca.1
MLINKS= enca.1 enconv.1
diff --git a/converters/fix-mime-charset/Makefile b/converters/fix-mime-charset/Makefile
index ebf2ce660d0f..fd9b6feaba2b 100644
--- a/converters/fix-mime-charset/Makefile
+++ b/converters/fix-mime-charset/Makefile
@@ -21,8 +21,8 @@ PORTDOCS= README.koi8r README
GNU_CONFIGURE= yes
USE_PERL5_BUILD= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= fix-mime-charset.1
PLIST_FILES= bin/fix-mime-charset
diff --git a/converters/ical2html/Makefile b/converters/ical2html/Makefile
index 9e81b85d7c2e..0cd10821eb0a 100644
--- a/converters/ical2html/Makefile
+++ b/converters/ical2html/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= ical.44:${PORTSDIR}/devel/libical
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libical -I${LOCALBASE}/include" \
- LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include/libical -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 2074d9499e33..24d178448d54 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= poppler.13:${PORTSDIR}/graphics/poppler
LIB_DEPENDS+= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBS=${PTHREAD_LIBS} \
- CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
PLIST_FILES= bin/pdf2djvu
diff --git a/converters/rcctools/Makefile b/converters/rcctools/Makefile
index 92c2e74176c2..15a59c2fff88 100644
--- a/converters/rcctools/Makefile
+++ b/converters/rcctools/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= rcc.2:${PORTSDIR}/devel/librcc
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= bin/rcc-recode
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 18a205d72d6a..b369c5178957 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -20,8 +20,8 @@ USE_AUTOTOOLS= libtool
USE_PERL5= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --without-included-gettext
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -fPIC
MAN1= recode.1
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 2eb39d36d2c0..46d9d0804649 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -16,7 +16,7 @@ COMMENT= A program for uu/xx/Base64/BinHex/yEnc de-/encoding
LIB_DEPENDS= uu.3:${PORTSDIR}/converters/uulib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-tcl
.include <bsd.port.pre.mk>
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index a5b3a96c9962..c067f444a69a 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -32,12 +32,12 @@ DOCFILES= ${FILESDIR}/porting.notes
USE_TK= 82+
.include <bsd.port.pre.mk>
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib \
- -lX11 -ltcl${TCL_VER:S/.//} \
- -ltk${TCL_VER:S/.//} -lm" \
- CPPFLAGS="-I${TCL_INCLUDEDIR} -DHAVE_TCL \
- -I${TK_INCLUDEDIR} -DHAVE_TK \
- -I${LOCALBASE}/include"
+CPPFLAGS+= -I${TCL_INCLUDEDIR} -DHAVE_TCL \
+ -I${TK_INCLUDEDIR} -DHAVE_TK \
+ -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib \
+ -lX11 -ltcl${TCL_VER:S/.//} \
+ -ltk${TCL_VER:S/.//} -lm
post-install:
${STRIP_CMD} ${PREFIX}/bin/uuwish
diff --git a/converters/ytnef/Makefile b/converters/ytnef/Makefile
index 12e8005e0634..0632de62e3c5 100644
--- a/converters/ytnef/Makefile
+++ b/converters/ytnef/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/ytnef bin/ytnefprocess.pl bin/ytnefprint
PORTDOCS= AUTHORS NEWS README
diff --git a/databases/animenfo-client-gtk/Makefile b/databases/animenfo-client-gtk/Makefile
index fa40caeeaebf..941461e08e1d 100644
--- a/databases/animenfo-client-gtk/Makefile
+++ b/databases/animenfo-client-gtk/Makefile
@@ -25,7 +25,6 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
CFLAGS+= ${CPPFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/databases/beansdb/Makefile b/databases/beansdb/Makefile
index c7c84059367c..5a75d9781daa 100644
--- a/databases/beansdb/Makefile
+++ b/databases/beansdb/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= qingfeng@douban.com
COMMENT= Yet anonther distributed key-value storage system from Douban Inc
GNU_CONFIGURE= yes
-CFLAGS+= -pthread
-MAKE_ENV+= CFLAGS="${CFLAGS}"
+CFLAGS+= ${PTHREAD_LIBS}
MAN1= beansdb.1
PLIST_FILES= bin/beansdb
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 5a3f74bed414..e52f47389982 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= lfc.1:${PORTSDIR}/devel/lfc \
lfcxml.1:${PORTSDIR}/devel/lfcxml
GNU_CONFIGURE= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
USE_AUTOTOOLS= autoconf:env
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index f55d312cdb58..af291e56d14e 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -37,8 +37,8 @@ USE_XORG+= x11 xau ice xproto xmu xpm
WANT_GNOME= yes
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= IODBC "iODBC support" on \
UNIXODBC "unixODBC support (not with iODBC)" off \
diff --git a/databases/cyrus-imspd/Makefile b/databases/cyrus-imspd/Makefile
index dbe62fa86e5a..ffb7421143f5 100644
--- a/databases/cyrus-imspd/Makefile
+++ b/databases/cyrus-imspd/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
GNU_CONFIGURE= YES
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-sasldir=${LOCALBASE} \
--with-sasl=${LOCALBASE} \
diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index bfdc9513c0aa..ddb8d2162997 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -31,8 +31,8 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" \
- CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}
USE_GMAKE= yes
REINPLACE_ARGS= -i ""
diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index 16ad45222e3f..e748339292da 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= apps/database/proprietary
MAINTAINER= ports@FreeBSD.org
COMMENT= View dBase III files
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
MAN1= dbview.1
DOCS= README dBASE
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 7ff4df03b468..5dd1ac5fc4ed 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -39,8 +39,8 @@ CONFIGURE_ARGS= --enable-static \
--enable-gnome-keyring=yes \
--with-openldap=yes \
--with-libdb=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2"
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 7ed696633fdb..4ab4bbe4e6a7 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -80,8 +80,7 @@ CLIENT_BIN= gpre isql-fb qli
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(NOPORTDOCS)
diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile
index 1e8bb593e1f9..acb5b5d51877 100644
--- a/databases/firebird21-server/Makefile
+++ b/databases/firebird21-server/Makefile
@@ -83,8 +83,7 @@ CLIENT_BIN= gpre isql-fb qli
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(NOPORTDOCS)
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 1a5c37cbaeb9..8be4e9b88a4f 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -41,8 +41,7 @@ CONFIGURE_ARGS= --with-system-editline \
--with-fbsbin=${PREFIX}/sbin \
--with-fbsecure-db=${LOCALSTATEDIR} \
--with-fbudf=${LIBEXECDIR}/UDF
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CFLAGS+= -I${LOCALBASE}/include
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index d1552893a551..f91b0d48a927 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -22,7 +22,7 @@ WX_PREMK= yes
WX_UNICODE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= pkg-message
MAN1= flamerobin.1
diff --git a/databases/flare/Makefile b/databases/flare/Makefile
index 43e21265f64c..b02046962eb0 100644
--- a/databases/flare/Makefile
+++ b/databases/flare/Makefile
@@ -22,7 +22,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE
+LDFLAGS+= -L${LOCALBASE}/lib
USE_RC_SUBR= flared flarei
SUB_FILES= pkg-message
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index bfb0d40c18f7..1fd7daba933f 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
GNU_GONFIGURE= yes
USE_AUTOTOOLS= autoconf:env libtool
CPPFLAGS+= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-tdsver=${TDS_VER}
USE_LDCONFIG= yes
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 6c1aa411ae93..68e768a5a49f 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -21,8 +21,8 @@ USE_ICONV= yes
USE_GMAKE= yes
GNU_GONFIGURE= yes
USE_AUTOTOOLS= autoconf:env libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-tdsver=${TDS_VER}
USE_LDCONFIG= yes
diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile
index aa2c0de57b2a..c9162c0737ca 100644
--- a/databases/gbib/Makefile
+++ b/databases/gbib/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gnomelibs
USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index e77c61f471fa..25d437704198 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -17,7 +17,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index ebae539e2ae2..76e244d6d9fb 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -38,8 +38,8 @@ USE_GNOME= gnomedocutils gnomehack gnomeprefix pygnomeextras
USE_LDCONFIG= yes
USE_PGSQL= yes
INSTALLS_OMF= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-postgres-utils=${LOCALBASE}/bin
INSTALLS_ICONS= yes
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 533f999353e1..cda56e1dff01 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -24,8 +24,8 @@ INSTALLS_OMF= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB= VERSION=${PORTVERSION}
DOCSDIR= ${PREFIX}/share/doc/gnomedb
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index cad6975eda9f..4bdada294746 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -22,9 +22,9 @@ USE_PYTHON= yes
USE_GNOME= pkgconfig
USE_GETTEXT= yes
CXXFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//}
CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
--with-python-incdir=${PYTHON_INCLUDEDIR} \
--with-fontconfig-incdir=${LOCALBASE}/include/fontconfig \
@@ -56,8 +56,8 @@ USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql-dir=${LOCALBASE} \
--with-mysql-incdir=${LOCALBASE}/include/mysql \
--with-mysql-libdir=${LOCALBASE}/lib/mysql
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= MYSQL=""
.else
CONFIGURE_ARGS+= --without-mysql
@@ -68,7 +68,8 @@ PLIST_SUB+= MYSQL="@comment "
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-postgres-incdir=${LOCALBASE}/include/ \
--with-postgres-libdir=${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= POSTGRESQL=""
.else
CONFIGURE_ARGS+= --without-postgres
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index b23a9ba4fc4f..3c05b81794bf 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB= VERSION=${PORTVERSION}
MAKE_JOBS_UNSAFE=yes
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index b9ba55e4542c..7c25189984d7 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -35,8 +35,8 @@ INSTALLS_OMF= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-bdb
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= gda-config-tool.1
MAN5= gda-config.5
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 2c5017a1548f..326f6d889be1 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-bdb --without-sybase
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 73515678eddc..345beca6b0ff 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -40,8 +40,8 @@ MAKE_JOBS_UNSAFE=yes
CONFIGURE_ARGS= --without-oracle \
--disable-crypto \
--enable-introspection=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
.if ${LIBGDA4_SLAVE}=="no"
OPTIONS= UI "Build UI tools" on
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 528e2e208cb7..9d0428e60377 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= libgnomedb-3.0.schemas
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 46fb93d8f58e..6ccaa29fc6a6 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -19,14 +19,13 @@ CONFLICTS= unixODBC-[0-9]*
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR}
USE_LDCONFIG= yes
MAN1= iodbc-config.1 iodbctest.1 iodbctestw.1
-CPPFLAGS= ${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
-LDFLAGS= ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
+LDFLAGS+= ${PTHREAD_LIBS}
.if defined(WITH_GUI)
USE_GNOME+= gtk20
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index c78b433f42e9..e07959db4eb9 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -23,12 +23,11 @@ OPTIONS= MYSQL "Add MySQL support" on \
USE_GNOME= gnomehack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile
index dcb05d89c4b1..033a5f0c1cf4 100644
--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@@ -28,10 +28,9 @@ LUASQL_DRIVER?= mysql
MAKE_ENV+= LUA_DIR=${LUA_SUBDIR} \
LUA_INC=${LUA_INCDIR} \
LUA_LIBDIR=${LUA_LIBDIR} \
- LDFLAGS="-shared" \
LUA_VERSION_NUM="${LUA_VER_STR}0" \
T=${LUASQL_DRIVER}
-
+LDFLAGS+= -shared
CFLAGS+= -fPIC
PLIST_SUB+= LUA_MIDLIBDIR=${LUA_MODLIBDIR}
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 8b0fa487b164..d81be537cb58 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -53,9 +53,8 @@ CONFIGURE_ARGS+= --enable-replication
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --enable-sasl
CFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS= ${CFLAGS}
+CPPFLAGS+= ${CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.else
CONFIGURE_ARGS+= --disable-sasl
.endif
diff --git a/databases/memcached12/Makefile b/databases/memcached12/Makefile
index 51fcb28530a8..5816403a5d91 100644
--- a/databases/memcached12/Makefile
+++ b/databases/memcached12/Makefile
@@ -58,7 +58,6 @@ LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --enable-sasl
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.else
CONFIGURE_ARGS+= --disable-sasl
.endif
diff --git a/databases/memcachedb/Makefile b/databases/memcachedb/Makefile
index 7c53e8228d01..2a9d24878827 100644
--- a/databases/memcachedb/Makefile
+++ b/databases/memcachedb/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
CFLAGS= -I"${BDB_INCLUDE_DIR}"
CONFIGURE_ARGS= --enable-threads --with-bdb="${LOCALBASE}" \
--with-libevent="${LOCALBASE}"
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
GNU_CONFIGURE= yes
-LDFLAGS= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
+LDFLAGS+= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
MCDBDIR?= /var/db/memcachedb
USE_BDB= 47+
USE_RC_SUBR= ${PORTNAME}
diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile
index 82e86ed1d5e5..67926c772184 100644
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
CFLAGS+= -I"${BDB_INCLUDE_DIR}"
LDFLAGS+= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
USE_RC_SUBR= memcacheq
USE_BDB= 47+
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 9f0ad88392f6..70426d0cfd5d 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= 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/databases/my2cego/Makefile b/databases/my2cego/Makefile
index 96914b0e273d..1ba9ae39015d 100644
--- a/databases/my2cego/Makefile
+++ b/databases/my2cego/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= lfc.1:${PORTSDIR}/devel/lfc \
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
USE_AUTOTOOLS= autoconf:env
PLIST_FILES= bin/my2cego
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 87f5dd267b7f..f218eeb8ed6a 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool libltdl
USE_LDCONFIG= yes
CFLAGS+= -L${LOCALBASE}/lib
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-mysql-path=${LOCALBASE} --without-samples \
--disable-gui --enable-test=no
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index 7b9c947f450a..49163a0aa712 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent \
CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
- PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc"
+CONFIGURE_ENV+= PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc"
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_ICONV= yes
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 09b7682ad02e..35e314d3ee91 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -23,8 +23,8 @@ USE_MYSQL= yes
WANT_MYSQL_VER?= 51
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
CONFIGURE_ARGS= --prefix="${PREFIX}" \
--libdir="${PREFIX}/lib/mysql/plugin" \
--with-mysql="$$(cd ${PORTSDIR}/databases/mysql${MYSQL_VER}-server; ${MAKE} -V WRKSRC)"
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index f34562f5cb37..72960fd1e737 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -58,8 +58,7 @@ DATADIR= ${PREFIX}/share/mysql-workbench
CXXFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GNOME2_DIR="${LOCALBASE}" LDFLAGS="${LDFLAGS}" LUA_LIBS="-llua"
-
+CONFIGURE_ENV= GNOME2_DIR="${LOCALBASE}" LUA_LIBS="-llua"
USE_MYSQL= client
DEFAULT_MYSQL_VER= 51
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index 277add22525e..d606c9042469 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -38,7 +38,8 @@ CONFIGURE_ARGS= --with-iodbc
.endif
CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 0a788171ac95..7f25f1c41b3e 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -19,8 +19,8 @@ USE_MYSQL= yes
USE_GNOME= pkgconfig gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-mysql=${LOCALBASE}
USE_LDCONFIG= yes
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index cb3d30041e1d..f0ee1805edf0 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -20,7 +20,6 @@ USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-backends="${CONFIGURE_MODULES}"
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= ${PREFIX}/lib/opendbx
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile
index c01e0860b6ff..efd47e108232 100644
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
PORTSCOUT= skipv:1.801
CFLAGS+= -I${BDB_INCLUDE_DIR}
-MAKE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
PERL_CONFIGURE= yes
USE_BDB= 43+
diff --git a/databases/pecl-handlersocket/Makefile b/databases/pecl-handlersocket/Makefile
index b4a35e23b220..2cc69395fa3f 100644
--- a/databases/pecl-handlersocket/Makefile
+++ b/databases/pecl-handlersocket/Makefile
@@ -23,7 +23,7 @@ USE_PHP= yes
USE_PHPEXT= yes
CONFIGURE_ARGS= --with-handlersocket=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS}
.include <bsd.port.mk>
diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile
index 4d81683acd6a..6638c412b28e 100644
--- a/databases/pecl-rrd/Makefile
+++ b/databases/pecl-rrd/Makefile
@@ -18,7 +18,7 @@ COMMENT= PHP bindings to rrd tool system
LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= PHP301
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 0a2fc3c9dd30..7d7fb6da2170 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE= yes
IGNORE_WITH_PGSQL= 73 74 80 81 82
DEFAULT_PGSQL_VER?= 83
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-wx-version=${USE_WX}
USE_GNOME= libxml2 libxslt
USE_WX= 2.8
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 5812689e9599..6d7d96dacc6e 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -35,16 +35,13 @@ INCLUDES+= -I${TCL_INCDIR}
TCL_INCDIR= ${LOCALBASE}/include/tcl${TCLVERSION}
TCLCONFIG= ${LOCALBASE}/lib/tcl${TCLVERSION}
MAKE_ENV+= TCL_INCDIR=${TCL_INCDIR}
-CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
- CFLAGS=-DPGTCL_USE_TCLOBJ
+CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}"
+CFLAGS+= -DPGTCL_USE_TCLOBJ
.if defined(WITHOUT_X11)
WITHOUT_TK= yes
.endif
-CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \
- CFLAGS=-DPGTCL_USE_TCLOBJ
-
.if defined(WITHOUT_TK)
CONFIGURE_ARGS+= --without-tk
INCDIRS= ${TCL_INCDIR}
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index ab69ca9e7555..b5dab8d0d2ec 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
--with-includes=${PREFIX}/lib \
--enable-thread-safety \
--with-docdir=${DOCSDIR}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES=${INCLUDES} \
+CONFIGURE_ENV+= INCLUDES=${INCLUDES} \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 99e01933a334..a51c0932ebdf 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
--with-includes=${PREFIX}/lib \
--enable-thread-safety \
--with-docdir=${DOCSDIR}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 32437f54d3f9..68823aee796a 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -44,8 +44,7 @@ INCLUDES+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
--with-includes=${PREFIX}/include \
--enable-thread-safety
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 5e702a374a7b..4bb749227a69 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -42,8 +42,7 @@ INCLUDES+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
--with-includes=${PREFIX}/include \
--enable-thread-safety
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 262423b153d5..deaf9a186029 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -43,8 +43,7 @@ INCLUDES+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
--with-includes=${PREFIX}/include \
--enable-thread-safety
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 262423b153d5..deaf9a186029 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -43,8 +43,7 @@ INCLUDES+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
--with-includes=${PREFIX}/include \
--enable-thread-safety
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 5ee5c0ff3713..3c928cda398d 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -22,7 +22,8 @@ USE_ICONV= yes
USE_GETTEXT= yes
USE_PERL5= 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
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 933b7424f9fa..28c00edf2392 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -16,9 +16,8 @@ COMMENT= Collection of tools to work with Paradox databases
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' \
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index b4af52038c7a..076fba711fed 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -22,8 +22,8 @@ CONFIGURE_ARGS= --enable-zlib \
--enable-iconv \
--enable-pthread
CFLAGS+= ${PTHREAD_CFLAGS}
-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
MAKE_ARGS= RELCFLAGS="${CFLAGS}" \
MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
.if !defined(NOPORTDOCS)
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index d445468dd39d..4d0b495d8563 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -96,7 +96,6 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index cf5d21dda3c6..1f9b2223fbef 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -70,7 +70,6 @@ PLIST_SUB+= WITH_PERL="@comment "
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \
diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile
index a41e8f8c7768..d2c488848886 100644
--- a/databases/sqlcached/Makefile
+++ b/databases/sqlcached/Makefile
@@ -16,7 +16,7 @@ COMMENT= A cache daemon using SQL for data manipulation
LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2
-MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS= -O2 -Wall -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 7a166768d1fb..d2f5a3a21fd9 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -31,6 +31,7 @@ USE_TCL_BUILD= 84+
CONFIGURE_ENV+= TCLSH_CMD="${TCLSH}" \
TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \
ac_cv_search_pthread_create=""
+CPPFLAGS+= -I. -I./src
# Use an in-ram database for temporary tables (never,no,yes,always),
# which is equivalent of SQLITE_TEMP_STORE=[0,1,2,3]
@@ -205,9 +206,6 @@ CONFIGURE_ARGS+= --enable-load-extension
CONFIGURE_ARGS+= --disable-load-extension
.endif
-CONFIGURE_ENV+= CPPFLAGS="-I. -I./src ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKE_ENV+= CPPFLAGS="-I. -I./src ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
.include <bsd.port.pre.mk>
.if defined(TCL_VER) && ${TCL_VER} > 8.4
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index b4f985e2be38..0256d3861650 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= rudiments.1:${PORTSDIR}/devel/rudiments
WANT_GNOME= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf libtool
-CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV}
CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
--disable-tcl \
--disable-java \
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 8f1e75874712..0102829a31f4 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -27,14 +27,14 @@ MAN8= ttservctl.8
OPTIONS= LUA "Enable LUA support" off
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
.if defined(WITH_LUA)
CONFIGURE_ARGS+= --enable-lua
-CONFIGURE_ENV+= LDFLAGS="-L${LUA_LIBDIR}"
+LDFLAGS+= -L${LUA_LIBDIR}
CFLAGS+= -I${LUA_INCDIR}
USE_LUA= yes
.else
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 30ca4b6d4c93..980630af46e1 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -28,8 +28,8 @@ CONFIGURE_ARGS= --with-readline\
--enable-bpel-vad\
--datadir="${PREFIX}"\
--localstatedir="${PREFIX}"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib
USE_RC_SUBR= virtuoso.sh
ONLY_FOR_ARCHS= i386 amd64
USERS= virtuoso
diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index a14a9a6af1de..1a1cc1575026 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -25,7 +25,6 @@ USE_XORG= x11
USE_TK= 82
USE_TCL= 82
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
CFLAGS+= -I$(LOCALBASE)/include \
-I$(LOCALBASE)/include/tcl8.2 \
-I$(LOCALBASE)/include/tk8.2
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index f5eeed4d7c8d..75f4d91c094f 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -23,8 +23,8 @@ USE_GETTEXT= yes
USE_PYTHON= 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
post-patch:
@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index f5b145d628a1..9eb595a700c8 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -18,8 +18,8 @@ COMMENT= GTK+/GNOME front-end for Babylon Translator .dic files
USE_GETTEXT= yes
USE_GNOME= gtk12 gnomehack gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 91e049b7ebc6..5fedec35a701 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/deskutils/buoh/Makefile b/deskutils/buoh/Makefile
index 9dd5ed1316e5..ace6978a6501 100644
--- a/deskutils/buoh/Makefile
+++ b/deskutils/buoh/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCS= AUTHORS COPYING ChangeLog NEWS README TODO
GCONF_SCHEMAS= buoh.schemas
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index f16eac631d91..f73d58f99f56 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -53,8 +53,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
PYSETUP= setup.py
CFLAGS+= "-I${LOCALBASE}/include"
LDFLAGS+= "-L${LOCALBASE}/lib"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" \
- FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
+MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
FC_LIB_DIR="${LOCALBASE}/lib" \
OVERRIDE_CFLAGS="${CFLAGS}" \
OVERRIDE_LDFLAGS="${LDFLAGS}"
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 5810ae7ae8cb..21e8e5539fb3 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= pygnome2 gnomeprefix
OPTIONS= NAUTILUS "Enable Nautilus Plugin" On \
EOG "Enable Eye-Of-Gnome Plugin" On
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index 8ee1d81ac25d..8c040fc3cc1c 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -15,7 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= smyru@heron.pl
COMMENT= Simple yet powerful address book based on Evolution data server
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_GNOME= gtk20 gnomehier evolutiondataserver gnomevfs2
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index f1fcee1fcc82..457beb5c7c05 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -28,8 +28,8 @@ USE_DISPLAY= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= deskbar-applet.schemas
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index b3d26b596b37..cd4754625ffd 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -16,8 +16,8 @@ COMMENT= GTK2 address book
USE_GNOME= gnomehack gnomeprefix gtk20 libxml2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/dlume share/pixmaps/dlume.png
diff --git a/deskutils/doodle/Makefile b/deskutils/doodle/Makefile
index 73e31759e9a0..0806e4db3577 100644
--- a/deskutils/doodle/Makefile
+++ b/deskutils/doodle/Makefile
@@ -23,7 +23,8 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_FAM= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= doodle.1 doodled.1
MAN3= libdoodle.3
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index b429d28dab2a..5f2f0551c230 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -25,15 +25,14 @@ USE_GNOME= gconf2 gnomedocutils gnomevfs2 gtksourceview2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
MAKE_JOBS_SAFE= yes
GCONF_SCHEMAS= drivel.schemas
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 67641ccb4d3a..59c61b026169 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -27,8 +27,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
EVO_VERSION= 2.28
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 5accc4450f6d..259a6881cf64 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -48,7 +48,7 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= TARGET_ARCH=desktop UI_TYPE=${UI} TARGET_STATUS=${STATUS} \
ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \
- LD="${CXX}" LDFLAGS="${LDFLAGS}"
+ LD="${CXX}"
MAKE_ARGS+= MAKE=${GMAKE} LIBDIR=${PREFIX}/lib
post-patch:
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index f36d9646f8bd..d34743d68e3a 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS= anyremote:${PORTSDIR}/comms/anyremote
GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_GNOME= pygtk2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= AUTHORS COPYING README ChangeLog
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 0836434ea5dd..ff766ec59867 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -28,13 +28,12 @@ USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
MAN1= ${PORTNAME}.1
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 5255ad218937..6717dea8a5bf 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-extra-gcc-optimization
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index f199d0d5b6e2..0784dd7c867d 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -27,8 +27,8 @@ USE_PYTHON= yes
GCONF_SCHEMAS= gimmie.schemas
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-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/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index c56f035d4913..3f53540a2b6c 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= glabels.1
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index b3fb780c96b2..feaff71525c1 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -24,9 +24,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool automake:env autoheader:env
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= XFCE4_PANEL "Xfce panel applet" Off
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index bb56d7da6618..469d9f27cf85 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 pygtk2 pygnomeextras
GNU_CONFIGURE= yes
USE_PYTHON= 2.2+
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnochm.schemas
INSTALLS_OMF= yes
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 3c35888d33b6..8be175b4668f 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix pygnome2 intlhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnomeblog.schemas
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index 283e12170dd8..0035d5167ce1 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -23,9 +23,9 @@ USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= application-browser.schemas slab.schemas
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 90318480eccf..49995430bd87 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -29,8 +29,8 @@ INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-maintainer-flags=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
gnome-system-log.1 baobab.1
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index dd84b7514a1c..3abc33c6d384 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -28,9 +28,9 @@ GCONF_SCHEMAS= gnote.schemas
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PANELAPPLET_SERVER_DIR="${PREFIX}/libdata/bonobo/servers"
+CONFIGURE_ENV= PANELAPPLET_SERVER_DIR="${PREFIX}/libdata/bonobo/servers"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-dbus
DOCS= AUTHORS COPYING ChangeLog NEWS README TODO
MAN1= gnote.1
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 1be663112d44..586d3e343047 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -26,8 +26,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool libltdl
LIBTOOLFILES= configure ../${QOF_DISTNAME}/configure
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
+CONFIGURE_ENV= LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}"
USE_LDCONFIG= yes
INSTALLS_OMF= yes
@@ -38,8 +37,8 @@ QOF_VERSION= 0.7.5
QOF_DISTNAME= qof-${QOF_VERSION}
QOF_WRKSRC= ${WRKDIR}/${QOF_DISTNAME}
-CPPFLAGS= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
-LDFLAGS= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
LIBQOF_CFLAGS= -I${QOF_WRKSRC}/qof
LIBQOF_LIBS= -L${QOF_WRKSRC}/qof/.libs -lqof
@@ -57,6 +56,7 @@ pre-configure:
@(cd ${QOF_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
./configure --prefix=${PREFIX} --disable-error-on-warning \
--disable-sqlite --disable-gdasql)
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index 3d806f8e1793..2b66cc18bec7 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -36,7 +36,8 @@ USE_GMAKE= yes
USE_GCC= 4.2+
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include -Wno-deprecated-declarations
CONFIGURE_ARGS= --disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
USE_AUTOTOOLS= libtool:env autoconf:env automake:env aclocal:env libltdl
WANT_GNOME= yes
@@ -79,7 +80,7 @@ pre-everything::
.include <bsd.port.pre.mk>
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations"
+CPPFLAGS+= -I${LOCALBASE}/include -Wno-deprecated-declarations
.if ${OSVERSION} < 700000
IGNORE= needs 7.X or higher
diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 915b279593c5..7d5d44e5567d 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -16,8 +16,8 @@ COMMENT= A simple customizable GTK screen ruler
USE_GNOME= gnomeprefix gnomehack libgnomeui libglade2
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=""||' ${WRKSRC}/configure
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index f76d205a3c0b..76f8cabfdf2e 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -21,12 +21,11 @@ USE_PERL5_BUILD=yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ${PORTNAME}.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|1.1.7|${PORTVERSION}|g' ${WRKSRC}/configure
diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile
index 8a38222cb20d..52b1d3ed671d 100644
--- a/deskutils/gtodo/Makefile
+++ b/deskutils/gtodo/Makefile
@@ -18,8 +18,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gnomevfs2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gtodo.schemas
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index aa134ff0e03f..99a9e8ac2bd4 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -24,8 +24,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gucharmap.schemas
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index d558ca6be256..2a46e7c8451e 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -35,7 +35,6 @@ UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
CONFIGURE_ARGS+= --with-sqlite-include=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-sqlite-library=${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
DEFAULT_LIBVERSION= 0.1.0
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 58529b49e22a..03da8a423afb 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -29,8 +29,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack pygnomedesktop \
gnomecontrolcenter2 gnomedocutils
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= hamster-applet.schemas
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
index b9a2c2e74411..30b5a68a1640 100644
--- a/deskutils/kchmviewer/Makefile
+++ b/deskutils/kchmviewer/Makefile
@@ -21,9 +21,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
DO_NOT_COMPILE+=chmlib
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
.if !defined(WITHOUT_KDE)
USE_KDELIBS_VER=3
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 58407734f3dd..310407d5be4b 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -63,7 +63,7 @@ LIB_DEPENDS+= gnokii:${PORTSDIR}/comms/gnokii
.endif # defined ($(WITH_GNOKII))
.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
.endif # defined(DO_NOT_COMPILE)
pre-everything::
diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile
index e6bdd36ad0d9..01667e547d9f 100644
--- a/deskutils/kickpim/Makefile
+++ b/deskutils/kickpim/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
MAKE_JOBS_UNSAFE= yes
post-extract:
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile
index c905bd3d7a81..46ef787ae172 100644
--- a/deskutils/krefty/Makefile
+++ b/deskutils/krefty/Makefile
@@ -17,7 +17,7 @@ USE_KDELIBS_VER=3
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
DOCSDIR= share/doc/HTML
diff --git a/deskutils/libopensync-plugin-synce-legacy/Makefile b/deskutils/libopensync-plugin-synce-legacy/Makefile
index 33c41ab7e4d7..00eafdafd197 100644
--- a/deskutils/libopensync-plugin-synce-legacy/Makefile
+++ b/deskutils/libopensync-plugin-synce-legacy/Makefile
@@ -25,7 +25,5 @@ USE_GNOME= glib20 libxml2
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index c152a6f85c68..4291325f8ecf 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GETTEXT= yes
USE_GNOME= gtk20
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 7603c63a71ec..7785f859e6fd 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -24,8 +24,8 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gtk20 libxml2 intlhack
CONFIGURE_ARGS= --program-transform-name="s/$$//"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
.ifndef(WITHOUT_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 7e92e10f9997..9dc248508927 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -18,10 +18,9 @@ USE_BZIP2= yes
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_GTOP)
CONFIGURE_ARGS+= --disable-gtop
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index eb693c6c904a..f71d52652be1 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -20,7 +20,8 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
USE_AUTOTOOLS= automake:env libtool
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
pre-configure:
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index c05b9aeefd5a..5e453d335e71 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT= yes
USE_GNOME= nautilus2 intlhack
USE_GMAKE= 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-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0
PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog-2008 ChangeLog-2009 INSTALL \
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index 0cfeddfc5a44..b39ccae242e1 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -19,10 +19,12 @@ COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GNOME= nautilus2 eel2 libgnomeui
+CONFIGURE_ENV= LIBS="-lssl"
PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \
- LDFLASG="-L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \
- LIBS="-lssl"
+# XXX: if was LDFLASG="..." Since variable is spelled incorrect,
+# this may be not needed at all
+LDFLAGS+= -L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`
PLIST_FILES= lib/nautilus/extensions-2.0/libnautilus-locked-folder.a \
lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \
lib/nautilus/extensions-2.0/libnautilus-locked-folder.so
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index 5e0dc396ccaa..2b5dc134c28f 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= nautilus-open-terminal.schemas
.include <bsd.port.mk>
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index b044fe64b3b4..5f2fa28c5492 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= intlhack gnomeprefix nautilus2 gnomehack \
evolutiondataserver
GNOME_DESKTOP_VERSION=2
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-plugins="${SENDTO_PLUGINS}"
OPTIONS= PIDGIN "Build pidgin sendto plugin" off \
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index e31e5317af7c..590551655471 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -27,8 +27,8 @@ USE_XORG= x11
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFLICTS= xfce4-notification-daemon-[0-9]* xfce4-notifyd-[0-9]*
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index 536939587bad..ccb215523f50 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -28,7 +28,8 @@ USE_GNOME= gnomehack gnomeprefix pygnomedesktop pygnomeextras
USE_GMAKE= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= ontv.schemas
INSTALLS_ICONS= yes
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index d082684a11f0..a9d3f12b9c49 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui panel
USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
xfixes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= BDB "Enable BDB support" off \
ICAL "Enable libical support" off
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-bdb4=no
.if defined(WITH_ICAL)
LIB_DEPENDS+= ical.44:${PORTSDIR}/devel/libical
-CONFIGURE_ENV+= CFLAGS="${CLFAGS} -I${LOCALBASE}/include/libical"
+CFLAGS+= -I${LOCALBASE}/include/libical
PLIST_SUB+= WITH_ICAL="@comment "
.else
CONFIGURE_ARGS+=--disable-libical
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index 06acdbc4b4c5..aaea422ee022 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -26,8 +26,8 @@ USE_GETTEXT= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libical" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include/libical
USE_GMAKE= yes
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 151e544c3b13..d280251f0207 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -43,7 +43,8 @@ LICENSE= GPLv2
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" MKDIR_P="${MKDIR}"
+CONFIGURE_ENV= MKDIR_P="${MKDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_XORG= pixman
USE_GETTEXT= yes
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index d1c8c7c93bf1..3c2046142ca8 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -28,8 +28,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static \
--disable-python \
--disable-python-plugin
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= planner.schemas
diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index 50607698cb89..e9625a7cb906 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -25,13 +25,12 @@ USE_GNOME= gconf2 gnomehack gnomeprefix libglade2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
GCONF_SCHEMAS= rubrica2.schemas
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 155c9a110891..d96c36c9422b 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -26,8 +26,8 @@ USE_QT_VER= 4
QT_COMPONENTS= corelib gui linguist svg webkit xml \
moc_build qmake_build uic_build
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
+CONFIGURE_ENV= PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
+CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index 6e9fbd212f3e..e0c6ef88eb74 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -26,7 +26,6 @@ USE_GNUSTEP_INSTALL= yes
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
ADDITIONAL_OBJCFLAGS= '-Dsel_isEqual(x,y) (x==y)'
pre-configure:
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index b731eb36c31b..c04406f4024b 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS= gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
USE_GMAKE= yes
USE_GNOME= gtk20 libwnck pango
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${RM} -f
diff --git a/deskutils/tagutils/Makefile b/deskutils/tagutils/Makefile
index b8cf526bd132..7bf72556aaec 100644
--- a/deskutils/tagutils/Makefile
+++ b/deskutils/tagutils/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack glib20 pkgconfig
USE_LDCONFIG= 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/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 6930d052b1a6..f07892490b25 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -31,8 +31,8 @@ USE_PERL5_RUN= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:env automake:env libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-docdir=${EXAMPLESDIR}/
USE_LDCONFIG= yes
diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 631e17ea2573..4ee6a2a23216 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -23,8 +23,8 @@ USE_PYTHON= 2.5+
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --libdir=${PREFIX}/libexec
GCONF_SCHEMAS= timer-applet.schemas
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 3a2e5a24612c..4ce3a4e8adcf 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_WX= 2.6+
WX_UNICODE= yes
WX_CONF_ARGS= absolute
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
LICENSE= GPLv2
diff --git a/deskutils/xfce4-volstatus-icon/Makefile b/deskutils/xfce4-volstatus-icon/Makefile
index b3a4d720d13f..3da55cf809dd 100644
--- a/deskutils/xfce4-volstatus-icon/Makefile
+++ b/deskutils/xfce4-volstatus-icon/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XORG= x11
USE_XFCE= libexo libgui libutil
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= GPLv2
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index c25d8cf2459b..74d92e2a5b1c 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -25,7 +25,6 @@ USE_ICONV= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index e17e112f74e2..920c12b30530 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_XORG= x11 sm
USE_GNOME= pkgconfig gtk20 gnomehier intltool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= xpad.1
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index a7c999e0bfcb..a55537f7f8d0 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= glib12
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-indent
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= libIDL
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 4b883817f987..0c4ce73300c0 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack libidl ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 8f6c93ff7cdd..e2ab28e87eed 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -23,8 +23,8 @@ USE_TK= yes
GNU_CONFIGURE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
CONFIGURE_ARGS= --with-nlsdir="${PREFIX}/share/locale"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- WISH="${WISH}"
+CONFIGURE_ENV= WISH="${WISH}"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
# XXX Manpages are installed into ${DATADIR} too -- there's no easy way to
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 6e95b1704121..0e9adea71333 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -101,8 +101,8 @@ PLIST_SUB+= PROFILE="@comment "
.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+=--enable-pthreads
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \
- LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD
+LDFLAGS+= ${PTHREAD_LIBS}
.else
CONFIGURE_ARGS+=--disable-pthreads
.endif
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index 750c587bec79..d7176d6d2b47 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= intltool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-plugin-valgrind \
--localedir=${PREFIX}/share
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index e7f17c4b345f..936bc4f37a74 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -41,8 +41,8 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-symbol-db-shm=/tmp \
--disable-vala \
--enable-introspection=no
diff --git a/devel/avarice/Makefile b/devel/avarice/Makefile
index 52cd049c0309..bc1c0bd96608 100644
--- a/devel/avarice/Makefile
+++ b/devel/avarice/Makefile
@@ -20,7 +20,8 @@ USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= avarice.1 ice-gdb.1 ice-insight.1
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 9a8bf053fd6f..3adb18c30a74 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE= yes
USE_GETTEXT= build
CONFIGURE_ARGS= --target=avr
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.if (${MACHINE_ARCH} == "amd64")
MACHINE_ARCH= x86_64
.endif
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index 3f280f311f00..716ef9b72a7d 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -18,7 +18,8 @@ MAN1= avrdude.1
MANCOMPRESSED= no
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
.include <bsd.port.pre.mk>
diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile
index 5b23b084591b..216921bf33e4 100644
--- a/devel/bennugd-modules/Makefile
+++ b/devel/bennugd-modules/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_SDL= sdl mixer
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd"
MAKE_JOBS_SAFE= yes
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 18e79aac2f0d..f8c6e8b1f693 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -31,7 +31,7 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING3
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING3.LIB
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-system-zlib \
--disable-werror \
--with-gmp=${LOCALBASE} \
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index afb7705eeef1..cb755db818d0 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= bison.1
INFO= bison
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 31bc6eb63dca..94814be04168 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gnomeprefix gnomehack bonobo gconf
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= 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|echo aout|echo elf|g' \
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index d9a73e12051b..e1b97f690acf 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT= yes
GNOME_HTML_DIR= ${PREFIX}/share/doc/bonobo
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
post-patch:
@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index abffc2be8417..f5c9f41e10c7 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -27,8 +27,8 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libbonobo \
gnomedocutils evolutiondataserver
GNOME_DESKTOP_VERSION=2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= bug-buddy.schemas
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index 3ecf3b212081..aefb3a5dc794 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
INFO= ccrtp
post-patch:
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index d91961e41e73..4aa9a4b611b2 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -28,7 +28,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline
RUN_DEPENDS= ${BUILD_DEPENDS}
LDFLAGS+= -rpath ${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-readline=${LOCALBASE}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif
post-patch:
diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index e21526284af6..f454d3827c9a 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -27,10 +27,10 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_OPENSSL= yes
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
- CGIT_SCRIPT_PATH=${WWWDIR} \
+MAKE_ENV+= CGIT_SCRIPT_PATH=${WWWDIR} \
CGIT_CONFIG=${PREFIX}/etc/cgitrc \
NEEDS_LIBICONV=yes
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= pkg-message
SUB_LIST+= PORTNAME=${PORTNAME}
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index c30727e93f31..5eb20d44bf42 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -28,7 +28,6 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs
USE_GMAKE= yes
USE_XORG= x11 xmu xi
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index d5e4a70a99f4..05bfa6089db0 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -19,12 +19,11 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_path_DOXYGEN=no
+CONFIGURE_ENV= ac_cv_path_DOXYGEN=no
INFO= commoncpp2
-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.mk>
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 5a7c42ae02c2..c14e4f1422cc 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -17,8 +17,9 @@ MAINTAINER= jasone@FreeBSD.org
COMMENT= Like make(1), but more powerful and clean
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
- YACC=yacc
+CONFIGURE_ENV= YACC=yacc
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
MAN1= c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 230bbe347e03..156ef9f6f6a7 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" TINYXML=-ltinyxml
+MAKE_ENV+= TINYXML=-ltinyxml
PLIST_FILES= bin/cppcheck
diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile
index 7af6ffe1bf89..377fae4ef742 100644
--- a/devel/cppi/Makefile
+++ b/devel/cppi/Makefile
@@ -17,7 +17,7 @@ COMMENT= A tool to indent the C preprocessor directives
USE_XZ= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= bin/cppi
MAN1= cppi.1
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index 9a3209132e63..c04d37db42b6 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -16,7 +16,7 @@ COMMENT= Unit Testing Framework for C and C++
LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
pangocairo:${PORTSDIR}/x11-toolkits/pango
-CPPFLAGS= "-I${LOCALBASE}/include"
+CPPFLAGS+= "-I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
GNU_CONFIGURE= yes
USE_GETTEXT= yes
diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile
index 59a8524bd0f0..924bcebc4036 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -19,7 +19,6 @@ EXTRA_PATCHES= ${FILESDIR}/extra-cvsd-buildroot.in
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-libwrap
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile
index 12355b1d8339..08660fec2851 100644
--- a/devel/cxxtools/Makefile
+++ b/devel/cxxtools/Makefile
@@ -18,8 +18,8 @@ PATCH_STRIP= -p1
USE_ICONV= yes
USE_CSTD= gnu89
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile
index c65db3e31253..ed10658cd01a 100644
--- a/devel/datadesigner/Makefile
+++ b/devel/datadesigner/Makefile
@@ -22,8 +22,8 @@ USE_ICONV= yes
USE_WX= 2.4
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 97cc7e0c7a65..7b9ecdf1967d 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -24,8 +24,8 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \
--disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PLIST_SUB= VERSION="1.0"
diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile
index a446421227b8..908edff2b587 100644
--- a/devel/dbus-qt3/Makefile
+++ b/devel/dbus-qt3/Makefile
@@ -24,8 +24,9 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= QTDIR=${LOCALBASE}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PLIST_SUB= VERSION="1.0"
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 7e33bca24a53..2288a162face 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -35,9 +35,9 @@ CONFIGURE_ARGS= --enable-mono \
--with-session-socket-dir=/var/tmp \
--disable-doxygen-docs \
--disable-xml-docs
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include <bsd.port.mk>
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 5f9fc4536f32..37b2eec03931 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -28,9 +28,9 @@ CONFIGURE_ARGS=--localstatedir=/var \
--with-session-socket-dir=/var/tmp \
--disable-doxygen-docs \
--disable-xml-docs
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_RC_SUBR= dbus
USE_GNOME_SUBR= yes
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 5bb584070867..b5245ec3acb2 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -29,8 +29,8 @@ 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
pre-build:
${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index c3a32beaa6e9..2d00adf98680 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -24,8 +24,6 @@ GNU_CONFIGURE= yes
CFLAGS+= -Wno-deprecated
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \
- LDFLAGS='${LDFLAGS}'
CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \
--with-readline-libraries=/usr/lib
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 5dc0726fdc2f..b18e8a7459b8 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -21,8 +21,9 @@ USE_GMAKE= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-lispdir
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
+CONFIGURE_ENV= EMACS="no"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= desktop-file-install.1 desktop-file-validate.1 \
update-desktop-database.1
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index aa1772c43222..46e50d6f00e1 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GCONF_SCHEMAS= devhelp.schemas
-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
OPTIONS= GEDIT "Enable GEdit plug-in support" off
diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile
index 891719164ac1..8b15ffd20d1c 100644
--- a/devel/dia2code/Makefile
+++ b/devel/dia2code/Makefile
@@ -17,8 +17,8 @@ COMMENT= A small utility used to generate code from a Dia diagram
USE_GNOME= libxml2
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}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 8049c36b286b..e5e5467cf42e 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -26,7 +26,8 @@ OPTIONS= FREETYPE2 "Enable Freetype support" on \
UNIQUE "Enable Unique (WM Module)" off \
TESTS "Install test apps" off
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 0056ab317f41..04e523bc53ad 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -25,8 +25,9 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gprof --disable-Werror
WANT_GNOME= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DISTCCD_PIDFILE=/var/run/distccd.pid
USE_RC_SUBR= distccd.sh
SUB_LIST= DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
diff --git a/devel/dklibs/Makefile b/devel/dklibs/Makefile
index 0d893edeae9b..3daabc19cab3 100644
--- a/devel/dklibs/Makefile
+++ b/devel/dklibs/Makefile
@@ -35,10 +35,8 @@ CONFIGURE_ARGS+= --datadir=${DATADIR} \
--datarootdir=${DATADIR} \
--sysconfdir=${ETCDIR}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-
# Need -lc for RELENG_6 support.
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc"
+LDFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc
.if !defined(NO_INSTALL_MANPAGES)
MAN3= dk.3 \
diff --git a/devel/dprog/Makefile b/devel/dprog/Makefile
index 4190a56e0790..19d8b0294e3e 100644
--- a/devel/dprog/Makefile
+++ b/devel/dprog/Makefile
@@ -18,8 +18,8 @@ COMMENT= A language for specifying dynamic programming algorithms
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= EMACS "Install emacs syntax files" on
diff --git a/devel/dwarfdump/Makefile b/devel/dwarfdump/Makefile
index f456e8d4f93e..039a307b7abb 100644
--- a/devel/dwarfdump/Makefile
+++ b/devel/dwarfdump/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf
WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
MAN1= dwarfdump.1
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index a18e2f38aa5e..cb883bb58ee1 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -24,8 +24,8 @@ MAKE_JOBS_UNSAFE=yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NO_INSTALL_MANPAGES)
CONFIGURE_ARGS+=--disable-man-pages
diff --git a/devel/fastdep/Makefile b/devel/fastdep/Makefile
index 12afce3ee002..26fa3afc63ec 100644
--- a/devel/fastdep/Makefile
+++ b/devel/fastdep/Makefile
@@ -17,7 +17,6 @@ COMMENT= Fast dependency generator for C/C++ files
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --disable-local-gnugetopt
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
DOCS= AUTHORS CHANGELOG INSTALL README \
doc/fastdep.html doc/fastdep.pdf doc/c*.htm
diff --git a/devel/fga/Makefile b/devel/fga/Makefile
index df87bb1e81e7..3d9db9beeb49 100644
--- a/devel/fga/Makefile
+++ b/devel/fga/Makefile
@@ -20,8 +20,6 @@ USE_GMAKE= yes
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-
EXAMPLES= graph_gen maxbit tsp tsp_bf
.if !defined(NOPORTDOCS)
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 1825617829c9..60d825a578a8 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities to maintain file history, do file comparisions and merges
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
ALL_TARGET= binaries po
MAKE_JOBS_UNSAFE= yes
@@ -23,8 +22,8 @@ MAN1= fcomp.1 fhist.1 fmerge.1
PLIST_FILES= bin/fcomp bin/fhist bin/fmerge
CFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 79fdf2e83d52..9d7a8931ec66 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_GNOME= glib20 gnomehack
NOT_FOR_ARCHS= ia64
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+= -fPIC
CONFIGURE_ARGS= --disable-Werror
post-patch:
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index e3bf5dbbfc1f..960721705e42 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -22,9 +22,8 @@ USE_GNOME?= gnomehack _glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--without-python
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -DHAVE_LINUX -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFLICTS= fam-[0-9]*
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index 9a01be98d4f0..585890790e70 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}
USE_LDCONFIG= yes
post-patch:
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 08b47800e4e9..ba57720a4454 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -27,8 +27,8 @@ USE_GNOME= gnomeprefix gnomehack glib12 gtk12 oaf libxml orbit
USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE=yes
.include <bsd.port.mk>
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 4582b4071659..4a5254f22cbd 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
# --enable-gconf-source=${PREFIX}/etc/gconf/schemas \
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gconftool-2.1 gsettings-data-convert.1 \
gsettings-schema-convert.1
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 77a1d3ed0ebe..ee4b34386993 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \
--with-libiconv-prefix=${LOCALBASE} \
--with-system-readline \
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 3a1eae0f5226..d3b3b4877c86 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -18,8 +18,8 @@ INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= VTE "Enable Virtual Terminal Emulation support" on \
NLS "Enable Native Language support" on
diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index d11ad707eb0c..363194dc5b9f 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -149,11 +149,11 @@ MAN8= gearmand.8
# This hack is required for the test programs invoked by configure,
# in the event that libmemcached was compiled with SASL support.
.if exists(${LOCALBASE}/lib/libsasl.so)
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lsasl"
+LDFLAGS+= -L${LOCALBASE}/lib -lsasl
.elif exists(${LOCALBASE}/lib/libsasl2.a)
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lsasl2"
+LDFLAGS+= -L${LOCALBASE}/lib -lsasl2
.else
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
.ifdef(WITH_DRIZZLE)
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 689c571f68da..dc58f03bb69d 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -26,9 +26,9 @@ CONFIGURE_ENV= ACLOCAL="${TRUE}" \
AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}" \
MAKEINFO="makeinfo --no-split" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
EMACS="no"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-csharp --disable-threads --disable-openmp \
--with-included-gettext --with-included-glib \
--with-included-libcroco --with-included-libxml \
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 216ade319a75..bdc7531056ac 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -27,8 +27,8 @@ USE_GNOME= glib20 gtk20 gtksourceview2 libglade2
USE_GETTEXT= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
PLIST_SUB+= GIGGLE_VER=${PORTVERSION}
.include <bsd.port.options.mk>
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index c9e69afa9c87..e105852122f0 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -18,8 +18,8 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= GNU indent
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --program-prefix=g
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 4be1789c5448..c3a0cb764176 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -32,9 +32,9 @@ USE_FAM= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --enable-static --with-libiconv=gnu
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
.include <bsd.port.mk>
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index dfd7f6c1039e..3793f66ac6c1 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 desktopfileutils
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= GNOME "Enable gnome support" on #\
# GNOMEDB "Enable libgnomedb support" off
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index da51a9fdd5cd..607d03cea87b 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -25,8 +25,8 @@ USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCSDIR= ${PREFIX}/share/doc/gladeui
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 8ddd86d519cb..467d90c7a016 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -25,7 +25,7 @@ JAVA_VERSION= 1.5+
JAVA_OS= native
USE_GNOME= gnomehack glib20
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
GLIB_API_VERSION= 0.4
PLIST_SUB= GLIB_API_VERSION=${GLIB_API_VERSION} PORTNAME=${PORTNAME}
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 1b1e98c8f44c..658a568b3042 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -47,10 +47,10 @@ CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \
--disable-dtrace \
--with-pcre=system \
--disable-fam
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
OPTIONS= COLLATION_FIX "fix string collation" off
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index 53e3f977eafd..efda154dcc13 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= yes
USE_GCC= 4.2+
PROJECTHOST= google-glog
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo"
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
.include <bsd.port.pre.mk>
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 11a5ced7b335..912df61b6275 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -17,7 +17,7 @@ COMMENT= A small coredump analysis tool for GNOME
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade gnomeprint
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/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
index bd25b6d8e21b..ca0a19361a0c 100644
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@@ -17,7 +17,7 @@ COMMENT= Gnome-vfs monikers module
USE_GNOME= gnomevfs2 libbonobo
USE_GMAKE= yes
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}
.include <bsd.port.mk>
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 78dd001d229d..540f254749fd 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS= --enable-openssl \
--disable-howl \
--with-hal-mount=/sbin/mount \
--with-hal-umount=/sbin/umount
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB=\"${PTHREAD_LIBS}\""
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB="${PTHREAD_LIBS}"
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PKGINSTALL= ${WRKDIR}/pkg-install
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index a9f619bcc22d..2c7e99fc5740 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -24,9 +24,9 @@ USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LATEST_LINK= gnome-vfs1
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 9b357dd59f23..27352b2f95a9 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -21,8 +21,7 @@ GNU_CONFIGURE= yes
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \
- CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c"
CONFIGURE_ARGS+= --with-thread-lib="${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf
CONFIGURE_ARGS+= --with-layout=gnustep
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 7e8b8a130d9c..82082129511f 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -17,8 +17,8 @@ COMMENT= A preprocessor for making GObjects with inline C
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/gob2 share/aclocal/gob2.m4 ${EXAMPLES:S/^/%%EXAMPLESDIR%%\//}
PLIST_DIRS= %%EXAMPLESDIR%%
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index fab681569648..fff14c21b392 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-tests
# Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 35f4dc0b9b29..763931a3a336 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION} \
SHORT_VER=0.8
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 968ffa71a523..118f40332dfa 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile
index 1a753bb6b1a9..38a5d523e252 100644
--- a/devel/goffice06/Makefile
+++ b/devel/goffice06/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 03fd16328a65..e8ec7fafc96a 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -24,8 +24,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 008c7c1411b6..716b45ded77f 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
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/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 3ac9cc624ab8..8324453d6c30 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex
CONFIGURE_ARGS= --disable-debug \
--enable-compile-warnings=no
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 38a669266387..d3720d72420f 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
OPTIONS= SDL "Enable SDL support" On \
ALLEGRO "Enable Allegro support" Off \
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 7f881c08c795..9e111d5d59e3 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= guikachu-form-editor.schemas guikachu-interface.schemas \
guikachu-mainwin.schemas
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 6353d38d69e2..b05b9c286751 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-obexftp
OPTIONS= FUSE "Enable fuse" off \
AVAHI "Enable AVAHI" on \
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 44b4278bd75d..e0017155b63a 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -19,8 +19,8 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
USE_XZ= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= idutils
MAN1= aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 361355938c6a..8d830426fe4a 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -19,8 +19,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include
MAKE_ENV+= SED="sed"
USE_LDCONFIG= yes
diff --git a/devel/jna/files/patch-native_Makefile b/devel/jna/files/patch-native_Makefile
index 90d7f167fa02..3a4d9479249f 100644
--- a/devel/jna/files/patch-native_Makefile
+++ b/devel/jna/files/patch-native_Makefile
@@ -3,6 +3,15 @@ $FreeBSD$
--- native/Makefile.orig
+++ native/Makefile
+@@ -20,6 +20,8 @@
+ # protection simply by defining HAVE_PROTECTION. This has been enabled
+ # only for those platforms on which it has been tested successfully.
+
++unexport LDFLAGS
++
+ OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \
+ -e 's/SunOS.*/solaris/g' \
+ -e 's/FreeBSD.*/freebsd/g' \
@@ -135,7 +135,7 @@
ifeq ($(OS),freebsd)
ARCH=$(shell uname -m | sed 's/i.86/i386/g')
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index afe699117f87..acc1af85405b 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -22,7 +22,7 @@ USE_XZ= yes
USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile
index b018d82fc5b3..60d89654f9fd 100644
--- a/devel/jzmq/Makefile
+++ b/devel/jzmq/Makefile
@@ -23,7 +23,8 @@ USE_JAVA= 1.4+
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-zeromq=${LOCALBASE}
-CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} LDFLAGS=${PTHREAD_LIBS}
+CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
+LDFLAGS+= ${PTHREAD_LIBS}
GNU_CONFIGURE= yes
PLIST_FILES= %%JAVAJARDIR%%/zmq.jar \
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 48ffa91bf79d..7f0a96ce07a7 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -27,7 +27,8 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
MAKE_ENV= EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
-CONFIGURE_ENV= CXXFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CXXFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 796c96e7ea8e..e2197dea35c0 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool
USE_SDL= image sdl
USE_GNOME= lthack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/lfcxml/Makefile b/devel/lfcxml/Makefile
index 5717fd9dede1..82fd63a17f29 100644
--- a/devel/lfcxml/Makefile
+++ b/devel/lfcxml/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS= lfc.1:${PORTSDIR}/devel/lfc
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
USE_AUTOTOOLS= autoconf:env
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 9f99ed56b24b..832c9f3119b2 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -24,8 +24,8 @@ USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= libIDL2
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index ef40279a8431..aa5c1f5bd444 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2 pkgconfig
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
INFO= libassetml
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 0f76d804ec1a..2c59f63f7ace 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
USE_EFL= imlib2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index a36c28e79d93..12954abe6da6 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -22,10 +22,8 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CFLAGS+= ${CPPFLAGS}
+CXXFLAGS+= ${CPPFLAGS}
post-patch:
@${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src|; \
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index e89182d4ff92..21bb9cb5e720 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -31,8 +31,8 @@ USE_PERL5= yes
USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale
MAN1= bonobo-activation-server.1
diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index b88f04c8560a..482a037378ba 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -23,10 +23,10 @@ GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \
--enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
PLIST_SUB= VER=${PORTVERSION}
diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
index 110f97de87dd..870dc449b8f4 100644
--- a/devel/libdlna/Makefile
+++ b/devel/libdlna/Makefile
@@ -28,7 +28,6 @@ MAKE_JOBS_UNSAFE= yes
CONFIGURE_ARGS+= --prefix="${PREFIX}" --disable-optimize \
--includedir=${LOCALBASE}/include \
--libdir=${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile
index ef10f39b2cc0..b426d20c9d89 100644
--- a/devel/libdwarf/Makefile
+++ b/devel/libdwarf/Makefile
@@ -25,8 +25,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libelf.so.0:${PORTSDIR}/devel/libelf
WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/libdwarf
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I. -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I. -I${LOCALBASE}/include
USE_DOS2UNIX= *.h
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index aa96ae1d1a5c..bd33b4d12b92 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG= yes
NOMAN= defined
.if !defined(WITHOUT_NLS)
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --enable-nls
USE_GETTEXT= yes
PLIST_SUB+= GETTEXT=""
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index 206d7358ebba..34e18f27e627 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -17,7 +17,7 @@ OPTIONS= BOOST "Build with boost" off
USE_AUTOTOOLS= autoconf libtool automake
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
USE_GNOME= pkgconfig gnomehack
diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile
index a85678f9a526..b056f7ca0546 100644
--- a/devel/libgalago/Makefile
+++ b/devel/libgalago/Makefile
@@ -24,7 +24,8 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tests
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-configure:
@${ECHO_CMD} "#define HAVE_STRCHR 1" >> ${WRKSRC}/config.h
diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index 0f5804b0eab4..e923766340b3 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -28,7 +28,7 @@ JAVA_VERSION= 1.5+
JAVA_OS= native
USE_GNOME= gnomehack gconf2
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
GCONF_API_VERSION= 2.12
GTK_API_VERSION= 2.10
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index f5dae65f757f..69e93d655da1 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack intltool ltverhack glib20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc"
.include <bsd.port.mk>
diff --git a/devel/libgiigic/Makefile b/devel/libgiigic/Makefile
index bf0eceab67a2..4496cf1b006f 100644
--- a/devel/libgiigic/Makefile
+++ b/devel/libgiigic/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= gicActionLazyAction.3 \
gicActionWrite.3 \
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index 7fd97465bf1a..e31fdf43620a 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -30,7 +30,7 @@ JAVA_VERSION= 1.5+
JAVA_OS= native
USE_GNOME= gnomehack libglade2
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
GLADE_API_VERSION= 2.12
GTK_API_VERSION= 2.10
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index e523e721ca7c..ea3f6f575b6a 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb
-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/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 735874e56be6..63a66c6f6f16 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -31,8 +31,8 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc \
--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index bef568f619a4..33dec365189e 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -22,8 +22,8 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \
--with-bz2 --with-gnome-vfs --with-gio
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgsf-1"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lgsf-1
GSF_SLAVE= yes
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index edb46cbbf5d0..9bef7963aa5a 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -28,8 +28,8 @@ USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
--without-bonobo
-CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(GSF_SLAVE)
MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index e409d3a29874..d03b22144153 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -28,8 +28,8 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= libgtop2
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index 987acc7bcf07..93d7251fe1db 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
USE_BZIP2= yes
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 47c5db343215..a83df975cfc7 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.if !defined(WITHOUT_PYTHON)
CONFIGURE_ARGS= --enable-python=yes
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --enable-python=no
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+= -fPIC
.endif
.include <bsd.port.post.mk>
diff --git a/devel/libleaftag/Makefile b/devel/libleaftag/Makefile
index 82c0ca2263a1..5022ce0198ec 100644
--- a/devel/libleaftag/Makefile
+++ b/devel/libleaftag/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomehack glib20 pkgconfig
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/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/devel/libmaa/Makefile b/devel/libmaa/Makefile
index 0643fd1d7ff4..e6df2e68f06f 100644
--- a/devel/libmaa/Makefile
+++ b/devel/libmaa/Makefile
@@ -17,7 +17,7 @@ COMMENT= Provides a few data structures and helpful functions
ALL_TARGET= lib
CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/libmba/Makefile b/devel/libmba/Makefile
index 343cddefa6e4..b568b507064e 100644
--- a/devel/libmba/Makefile
+++ b/devel/libmba/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_GMAKE= yes
MAKE_ENV= prefix="${PREFIX}" \
MINVERSION="${SHLIB_MAJOR}" \
- RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
USE_LDCONFIG= yes
diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile
index a0e0b3c13e62..c9d456a51488 100644
--- a/devel/libnfc/Makefile
+++ b/devel/libnfc/Makefile
@@ -83,8 +83,8 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/lib
.if defined(WITH_PN531USB) || defined(WITH_PN533USB)
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
-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}
.endif
.endif
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 57f5632b0ea6..2451455929b0 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -26,7 +26,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index acd86dde0833..f7c4a99435a4 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --with-hal
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 75a59477408d..5f1921dbd36a 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -24,13 +24,12 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= glib12 glib20 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-libwww
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|8\.4|84|g' ${WRKSRC}/configure
diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile
index 3a66e9a02968..214f357dd9ac 100644
--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
USE_BZIP2= yes
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
index 68d15c580ba7..e4d7ea0037b9 100644
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -26,11 +26,10 @@ USE_LDCONFIG= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV= "OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
- OPENSSL_LIBS=-L${OPENSSLLIB} \
- CPPFLAGS=-I${LOCALBASE}/include
-
+ OPENSSL_LIBS=-L${OPENSSLLIB}
+CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= "-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/devel/libpafe/Makefile b/devel/libpafe/Makefile
index e2321e85ef3a..3601f8b878ee 100644
--- a/devel/libpafe/Makefile
+++ b/devel/libpafe/Makefile
@@ -27,8 +27,8 @@ PLIST_DIRS= include/libpafe
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" \
- LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
.endif
.include <bsd.port.post.mk>
diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile
index 94d60f3b6f0b..9fe23bb1479a 100644
--- a/devel/libphish/Makefile
+++ b/devel/libphish/Makefile
@@ -20,10 +20,9 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include -DFreeBSD
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DFreeBSD
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
.if !defined(NOPORTDOCS)
diff --git a/devel/libpthread-stubs/Makefile b/devel/libpthread-stubs/Makefile
index 540d1137f77a..0913a917192d 100644
--- a/devel/libpthread-stubs/Makefile
+++ b/devel/libpthread-stubs/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 700000
-CONFIGURE_ENV+= LDFLAGS=-lpthread
+LDFLAGS+= -lpthread
.endif
.include <bsd.port.post.mk>
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 39cfadb081c6..381c8e1d64a7 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -30,11 +30,10 @@ USE_ICONV= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= autoheader
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
LIBS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LIBS="${LIBS}" \
+CONFIGURE_ENV= LIBS="${LIBS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
OPTIONS= BDB "Translation database support" off \
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 8e43961debfb..7bdcc02ea11c 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -21,8 +21,9 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
USE_GNOME= gnomehack gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
- ac_cv_path_DOXYGEN=""
+CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index ed0ff90726f7..ed37b0d69ae3 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -30,8 +30,8 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="2.4"
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index e2dde7b61e6c..83dbe9b7d325 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="2.2"
diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile
index 3a11110b9f0c..daf1d15ebb73 100644
--- a/devel/libtar/Makefile
+++ b/devel/libtar/Makefile
@@ -17,7 +17,6 @@ COMMENT= A library for manipulating POSIX and GNU tar files
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
post-install:
${INSTALL_DATA} ${WRKSRC}/lib/libtar.so.0 ${PREFIX}/lib
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index 1c565645a56c..c241900c9431 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -31,6 +31,5 @@ PLIST_SUB= NLS="@comment "
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 4caa9f3c5d36..8823100559b9 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \
--datadir=${PREFIX}/share
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/devel/libuninum/Makefile b/devel/libuninum/Makefile
index 9fad8cf742d4..a74c5911cd32 100644
--- a/devel/libuninum/Makefile
+++ b/devel/libuninum/Makefile
@@ -17,7 +17,6 @@ COMMENT= Library for converting Unicode strings to numbers
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include"
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index 1a350967392e..bf4678731ea1 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG= YES
USE_AUTOTOOLS= libtool
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} "s,^SUBDIRS = libvanessa_adt test debian,SUBDIRS = libvanessa_adt," \
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index 3f35612e6762..89bd42c9543b 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -24,7 +24,7 @@ MAN1= vanessa_socket_pipe.1
USE_AUTOTOOLS= libtool
USE_LDCONFIG= 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/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index 6b30155a10dc..220f14804116 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -24,7 +24,6 @@ USE_OPENSSL= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
post-patch:
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 7854d363e2a4..24d58c345b19 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -25,7 +25,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAN1= zvbi-ntsc-cc.1
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -L/usr/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L/usr/lib"
+CFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index f0526f350711..f94c018a594b 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -17,8 +17,8 @@ COMMENT= A logging library for C++
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
MAKE_JOBS_UNSAFE= yes
.if !defined(NOPORTDOCS)
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 9e6037ad9b7c..2cf0a2c21874 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -17,7 +17,8 @@ COMMENT= A library of C++ classes for flexible logging
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-pthreads --disable-html-docs
USE_LDCONFIG= yes
diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile
index 2e0c00853a0d..e601d5f748bb 100644
--- a/devel/log4shib/Makefile
+++ b/devel/log4shib/Makefile
@@ -18,7 +18,8 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig gnomehack
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-pthreads --disable-html-docs --disable-doxygen
USE_LDCONFIG= yes
diff --git a/devel/love/Makefile b/devel/love/Makefile
index fcbc4edc5f5f..25552e3dc770 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -25,9 +25,9 @@ USE_SDL= sdl mixer
USE_GL= gl glu
USE_LUA= 5.1+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
- -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib
PLIST_FILES= bin/love
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index fcbc4edc5f5f..25552e3dc770 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -25,9 +25,9 @@ USE_SDL= sdl mixer
USE_GL= gl glu
USE_LUA= 5.1+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
- -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib
PLIST_FILES= bin/love
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index fcbc4edc5f5f..25552e3dc770 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -25,9 +25,9 @@ USE_SDL= sdl mixer
USE_GL= gl glu
USE_LUA= 5.1+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
- -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib
PLIST_FILES= bin/love
diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile
index a60c1f810525..28a6fca984d0 100644
--- a/devel/luabind/Makefile
+++ b/devel/luabind/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs
USE_LUA= 5.1+
USE_LDCONFIG= yes
-CPPFLAGS= -I.. -I${LUA_INCDIR} -I${LOCALBASE}/include
-LDFLAGS= -L${LUA_LIBDIR}
+CPPFLAGS+= -I.. -I${LUA_INCDIR} -I${LOCALBASE}/include
+LDFLAGS+= -L${LUA_LIBDIR}
CXXFLAGS+= -fPIC
PORTDOCS= *
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index f4a54f06b673..459b75038a3f 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --disable-coss
MICO_SERVICE= "@comment "
.endif
-CONFIGURE_ENV+= CXXFLAGS="${CPPFLAGS} -Wno-unused"
+CXXFLAGS+= ${CPPFLAGS} -Wno-unused
.if defined(WITH_X11)
USE_XORG= x11
@@ -84,7 +84,6 @@ MICO_GTK= "@comment "
LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83
CONFIGURE_ARGS+= --with-tcl
CPPFLAGS+= -I${LOCALBASE}/include/tcl8.3
-CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS}
.else
MICO_TCL= "@comment "
.endif
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 07ececf41dcb..6a053e5832ab 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -30,9 +30,9 @@ USE_GMAKE= yes
USE_LUA= 5.1+
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/mtn bin/mtn-cleanup bin/mtnopt \
share/monotone/hooks/authorize_remote_automate.lua \
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 99122c7f1401..7a56bbefb98a 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -54,7 +54,7 @@ USE_TCL= 84+
TCLSUFFIX= -${TCL_NODOT}
MAKE_ENV+= WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q}
PLIST_SUB+= TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX}
-CONFIGURE_ENV+= CPPFLAGS=-I${TCL_INCLUDEDIR:Q}
+CPPFLAGS+= -I${TCL_INCLUDEDIR:Q}
SUB_FILES+= pkgIndex.tcl
pre-su-install:
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 48aaba8c5f03..b3c9aac0b39a 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static --enable-shared \
--disable-more-warnings
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= oafd.1
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index 980c6988312a..59461cb333ca 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS= --without-howl
USE_LDCONFIG= yes
.if !defined(WITHOUT_NLS)
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.else
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index f53bc0c2ae52..d57be32f6842 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -25,8 +25,8 @@ USE_OCAML_FINDLIB=yes
USE_OCAML_LDCONFIG=yes
USE_SDL= sdl ttf image mixer
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-findlib
DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index 06d592d9a79a..f4e9d8998edb 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -23,7 +23,8 @@ USE_XORG= x11 xaw
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 9ede9ef6bf1d..8ccddd759e17 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -33,8 +33,7 @@ MAKEFILE= GNUmakefile
USE_LDCONFIG= yes
CONFIGURE_SCRIPT= ../configure
-CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
- CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+= PYTHON=${PYTHON_CMD}
CONFIGURE_ARGS= --with-omniorb=${LOCALBASE}
.include <bsd.port.pre.mk>
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 17b2e42b3ad1..bce99079c319 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -20,8 +20,7 @@ USE_OPENSSL= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
MAKEFILE= GNUmakefile
-CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CPP=${CPP} \
- PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+= PYTHON=${PYTHON_CMD}
CONFIGURE_ARGS= --datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
--with-omniNames-logdir=/var/log
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 9bffe680b778..f08007627561 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -21,8 +21,8 @@ PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
- LDFLAGS="`${PCRE_CONFIG} --libs`"
+CPPFLAGS+= `${PCRE_CONFIG} --cflags`
+LDFLAGS+= `${PCRE_CONFIG} --libs`
USE_LDCONFIG= yes
MAN3= Pcre.3
diff --git a/devel/pecl-statgrab/Makefile b/devel/pecl-statgrab/Makefile
index db0576029225..5afda4a250df 100644
--- a/devel/pecl-statgrab/Makefile
+++ b/devel/pecl-statgrab/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab
USE_PHP= yes
USE_PHPEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -ldevstat ${EXTRA_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -ldevstat ${EXTRA_LIBS}
CONFIGURE_ARGS= --with-statgrab=${LOCALBASE}
diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index 9f91b4ce083d..aaf5a56edee9 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -15,8 +15,6 @@ COMMENT= Serial port pic16c84 programmer
USE_GMAKE= yes
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
PLIST_FILES= bin/picprog
MAN1= picprog.1
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index f810e2b2f7da..35fa7d918b42 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -26,9 +26,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
CONFIGURE_ARGS+= --with-pic=yes
-MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
SUB_FILES= pkg-message
OPTIONS= DEBUG "Enable debug information" off \
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index f9ac93bdc539..604b4b7a21f1 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -15,8 +15,8 @@ COMMENT= A getopt(3) like library with a number of enhancements, from Redhat
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--program-prefix=""
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
diff --git a/devel/present/Makefile b/devel/present/Makefile
index 59fa94365f85..94889dcc1a9a 100644
--- a/devel/present/Makefile
+++ b/devel/present/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice1
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_GNOME= gnomehack intlhack ltverhack
.include <bsd.port.mk>
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index 179791a0a421..de0da6bae87b 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "bin/ld"|g' ${WRKSRC}/configure
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index 26d32b55405c..7146045b2e71 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -80,8 +80,8 @@ PLIST_SUB+= BSDVIDEO="@comment "
.if defined(WITH_V4L)
CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= V4L=""
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+= v4l1.0:${PORTSDIR}/multimedia/libv4l
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 31f2887b253a..11c4bbe17334 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -36,13 +36,10 @@ MAKE_JOBS_UNSAFE= yes
CFLAGS= -O1
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS}"
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- STDCCFLAGS+="-I${LOCALBASE}"
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV= STDCCFLAGS+="-I${LOCALBASE}"
+CPPFLAGS+= -O1 -I${WRKSRC}/include -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if ${OSVERSION} >= 700042
CONFIGURE_ENV+= ATOMICITY_H="<ext/atomicity.h>"
diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile
index 1bf921ede24d..511231a88d86 100644
--- a/devel/py-itools/Makefile
+++ b/devel/py-itools/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+= ${BUILD_DEPENDS}
LIB_DEPENDS= glib:${PORTSDIR}/devel/glib20 \
soup:${PORTSDIR}/devel/libsoup
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_PYTHON= 2.6+
USE_PYDISTUTILS= yes
diff --git a/devel/py-libgsf/Makefile b/devel/py-libgsf/Makefile
index a105bb7839a0..4b79f63c4cef 100644
--- a/devel/py-libgsf/Makefile
+++ b/devel/py-libgsf/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= gnomehack libgsf_gnome gnomevfs2 ltverhack intlhack pygtk2
USE_PYTHON= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \
--disable-gtk-doc --with-bz2 --with-gnome --with-python
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS=
GSF_SLAVE= yes
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 48d5e7a2eaca..0f81490c53a0 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -38,8 +38,7 @@ MAKEFILE= GNUmakefile
USE_LDCONFIG= yes
CONFIGURE_SCRIPT= ../configure
-CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
- CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+= PYTHON=${PYTHON_CMD}
CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
pre-configure:
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index a772e5720d5a..c11841eb56cb 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -26,6 +26,6 @@ USE_GNOME= gnomehack orbit2
USE_PYTHON= yes
GNU_CONFIGURE= yes
ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile
index 194648b439a0..e3d105d621bb 100644
--- a/devel/py-shapely/Makefile
+++ b/devel/py-shapely/Makefile
@@ -17,7 +17,6 @@ COMMENT= Python Package for Manipulation 2D Geospatial Geometry
LIB_DEPENDS= geos_c.8:${PORTSDIR}/graphics/geos
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= CFLAGS="${CFLAGS}"
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index bf43d4bf8972..1d7ee637cb65 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -27,8 +27,8 @@ ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \
-I ${LOCALBASE}/share/aclocal \
-I ${WRKDIR}/autotools/m4
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(cpp|h)
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index 0939a3865732..07a089720672 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -18,7 +18,7 @@ COMMENT= A complete regular expressions C++ solution
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre"
+MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre"
post-patch:
@${REINPLACE_CMD} -e 's|@LIBTOOL@|${LIBTOOL}|g ; \
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 64f2c5b80379..c5db8e5aa064 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intltool intlhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= regexxer.schemas
INSTALLS_ICONS= regexxer.png
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index 5d093fabfd94..f67fbb79fd68 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -32,7 +32,7 @@ PLIST_FILES+= bin/rsvndump
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 700041
-CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
.endif
.if !defined(NOPORTDOCS)
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 405cbad3c677..3c2b4f830173 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -26,7 +26,6 @@ USE_GNOME= gnomehack pkgconfig
USE_ICONV= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
- LDFLAGS="${LDFLAGS}" \
ac_cv_header_libusbhid_h=no
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 94ebad53e7c5..ff664df17ce8 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -34,8 +34,8 @@ USE_GNOME= gnomehack gtk20 intltool libxml2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0
MAN1= seed.1
diff --git a/devel/sfslite-dbg/Makefile b/devel/sfslite-dbg/Makefile
index 75a16bf56af6..d081efd334e8 100644
--- a/devel/sfslite-dbg/Makefile
+++ b/devel/sfslite-dbg/Makefile
@@ -13,5 +13,5 @@ COMMENT= sfslite with dmalloc and without optimization
LIB_DEPENDS+= dmalloc:${PORTSDIR}/devel/dmalloc
PKG_INSTALL= ${MASTERDIR}/pkg-install
-CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index 026f7f456b01..62123d651f82 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index 8c7bddf7f5b9..24881bb9db30 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+= PORTDOCS="@comment "
.ifndef(WITH_PTHREADS)
CONFIGURE_ARGS+= --without-pthreads
.else
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
.endif
pre-everything::
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 8f42acd77b76..e675cf438563 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -36,7 +36,6 @@ USE_GL= gl glu glut
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-jpeg-factory
post-patch:
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index ec81e0ed5e1d..c01299641ba5 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnomehack glib12 libxml
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"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index 5c55dc097e85..dd4ab6404809 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/srec_cat \
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index b9a308854f37..3cef89d5150b 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -19,8 +19,8 @@ USE_AUTOTOOLS= libtool
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME}
USE_LDCONFIG= yes
diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
index efb8c13c1177..e51115afa817 100644
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@@ -26,8 +26,9 @@ USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ARGS+=--with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \
--with-subversion=${LOCALBASE}
-CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= QTDIR=${LOCALBASE}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
NO_LATEST_LINK= yes
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index ecb16a789e04..eb68530b3f1f 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config \
--with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}
post-extract:
@${CHMOD} +x ${WRKSRC}/configure
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index c1e1a4373aba..b482a0cc0a85 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -29,8 +29,8 @@ USE_GNOME= gnomehack glib20
USE_GETTEXT= 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
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
post-patch:
diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile
index 30012adbcbc7..d49938a31ae9 100644
--- a/devel/tdl/Makefile
+++ b/devel/tdl/Makefile
@@ -16,7 +16,6 @@ COMMENT= To-do list manager
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}"
MAN1= tdl.1
MLINKS= tdl.1 tdla.1 tdl.1 tdll.1 tdl.1 tdld.1 tdl.1 tdlg.1
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 7a6830c3b95a..3ad8aa10f5a3 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= desktopfileutils gnomehack gtk20 glib20 intltool intlhack \
USE_XFCE= configenv libexo libutil thunar
INSTALLS_ICONS= yes
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= NLS "Enable Native Language Support" on \
GIT "Enable Git support" off \
diff --git a/devel/tokamak/Makefile b/devel/tokamak/Makefile
index 5fa583321d70..3602079ffb77 100644
--- a/devel/tokamak/Makefile
+++ b/devel/tokamak/Makefile
@@ -29,7 +29,7 @@ PORTDOCS= *
.include <bsd.port.pre.mk>
.if !defined(WITH_DEBUG)
-MAKE_ENV+= CPPFLAGS=-DNDEBUG
+CPPFLAGS+= -DNDEBUG
.endif
post-extract:
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index 45349dd7ccf9..cd0a2dcd0220 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -17,7 +17,7 @@ COMMENT= A very light-weight C++ design patternlibrary
USE_GNOME= pkgconfig gnomehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
MAN1= args.1 car.1 commoncpp-config.1 mdsum.1 scrub-files.1 sockaddr.1 \
ucommon-config.1 zerofill.1
diff --git a/devel/urjtag/Makefile b/devel/urjtag/Makefile
index d15094a63959..e4d634073a99 100644
--- a/devel/urjtag/Makefile
+++ b/devel/urjtag/Makefile
@@ -19,10 +19,10 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= --std=c99
MAN1= jtag.1 bsdl2jtag.1
diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile
index 7b9ddfcf49e0..aab86d2ea54b 100644
--- a/devel/wand-libconfig/Makefile
+++ b/devel/wand-libconfig/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= include/libconfig.h lib/libconfig.a lib/libconfig.la \
lib/libconfig.so lib/libconfig.so.1
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index da3e3ed00c95..af126073881b 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -5,23 +5,23 @@
# $FreeBSD$
#
-PORTNAME= wininfo
-PORTVERSION= 0.7
+PORTNAME= wininfo
+PORTVERSION= 0.7
PORTREVISION= 9
-CATEGORIES= devel
-MASTER_SITES= http://www.freedesktop.org/software/wininfo/
+CATEGORIES= devel
+MASTER_SITES= http://www.freedesktop.org/software/wininfo/
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A window information utility
+MAINTAINER= ports@FreeBSD.org
+COMMENT= A window information utility
-USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \
- xcomposite x11 xres
-USE_GNOME= gtk20 gnomeprefix pkgconfig
-GNU_CONFIGURE= yes
+USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \
+ xcomposite x11 xres
+USE_GNOME= gtk20 gnomeprefix pkgconfig
+GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= wininfo.1
+MAN1= wininfo.1
.include <bsd.port.mk>
diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile
index 55fe49514806..cef4a1d5595d 100644
--- a/devel/xdg-user-dirs/Makefile
+++ b/devel/xdg-user-dirs/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_ICONV= yes
USE_GMAKE= yes
-CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index b1a99d0fe7a2..e1a2e89d6dca 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -20,7 +20,6 @@ COMMENT= A Borland-like IDE programming environment
USE_GMAKE= yes
USE_XORG= sm ice x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV=
CONFIGURE_ARGS= --libdir=${PREFIX}/share
ALL_TARGET= # none
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 7fc6394f74db..6685c9f9dd4d 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -20,8 +20,8 @@ MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-python --disable-python-bindings
-CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/devel/ztcl/Makefile b/devel/ztcl/Makefile
index c2a650271cf7..582c5d1104d1 100644
--- a/devel/ztcl/Makefile
+++ b/devel/ztcl/Makefile
@@ -29,10 +29,8 @@ INFO= ${PORTNAME} ${PORTNAME}-zlib
CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} \
--with-tclinclude=${TCL_INCLUDEDIR} \
--with-tclmorescripts=${PREFIX}/libexec/tclmore
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}" \
- LDFLAGS="${LDFLAGS} -L ${PREFIX}/lib"
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS} -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}" \
- LDFLAGS="${LDFLAGS} -L ${PREFIX}/lib"
+CPPFLAGS+= -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}
+LDFLAGS+= -L ${PREFIX}/lib
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/dns/autotrust/Makefile b/dns/autotrust/Makefile
index 276210995767..9063063236bf 100644
--- a/dns/autotrust/Makefile
+++ b/dns/autotrust/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS+= ldns.1:${PORTSDIR}/dns/ldns \
unbound.2:${PORTSDIR}/dns/unbound
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN8= autotrust.8
diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile
index 3a60c77646db..87e9461aff60 100644
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
CFLAGS+= -I${PREFIX}/include
LDFLAGS+= -L${PREFIX}/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
DOCFILES= CONTRIBUTORS COPYRIGHT INSTALL MODULES README
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 17087e6440ab..1119c1559a27 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -24,9 +24,9 @@ USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CXXFLAGS="-I${LOCALBASE}/include" \
- PERL=${PERL}
+CONFIGURE_ENV= PERL=${PERL}
+LDFLAGS+= -L${LOCALBASE}/lib
+CXXFLAGS+= -I${LOCALBASE}/include
USE_AUTOTOOLS= aclocal14 automake14 autoconf213
USE_BDB= yes
diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile
index 76aeec0efd6d..0d809f507902 100644
--- a/dns/ldapdns/Makefile
+++ b/dns/ldapdns/Makefile
@@ -21,7 +21,6 @@ LICENSE= GPLv2
USE_OPENLDAP= yes
HAS_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --prefix=${PREFIX}
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index 9bccfdc5236a..75af052a6a8b 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -19,8 +19,8 @@ USE_ICONV= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
INFO= libidn
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 9418010ff914..982816c08b78 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib
USE_AUTOTOOLS= autoconf libltdl libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so)
CONFIGURE_ARGS= --enable-fam
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index ccd869d43c35..bc6164976eca 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -32,8 +32,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomehack libxml2 gtk20 desktopfileutils librsvg2
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-gnomevfs --disable-collab-backend-xmpp \
--disable-collab-backend-sugar
USE_LDCONFIG= yes
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index f2e2fed355a6..ea68c7b80f07 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -17,8 +17,8 @@ INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack intlhack
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/editors/cooledit/Makefile b/editors/cooledit/Makefile
index f3642ee8962d..dd0cce34cbcb 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -21,13 +21,12 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_XORG= x11 xt
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= cooledit.1 coolman.1 smalledit.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}
CFLAGS+= -DHAVE_MBRTOWC
.if defined(WITH_NEXT_LOOK)
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index e4196fccc453..830bbc3a794d 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --without-xft
USE_XORG= xft xt
CONFIGURE_ARGS+= --libs="${LDFLAGS}"
CFLAGS+= `freetype-config --cflags`
-LDFLAGS= `freetype-config --libs`
+LDFLAGS+= `freetype-config --libs`
.endif
.endif
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index a5a9b7b30d0e..4601b89b1d0a 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -33,7 +33,6 @@ USE_GMAKE= yes
USE_XZ= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --localstatedir=/var
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_AUTOTOOLS= autoconf:env automake:env aclocal:env autoheader:env
diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile
index 851ac14d8634..69d1e76bb008 100644
--- a/editors/emacs.app/Makefile
+++ b/editors/emacs.app/Makefile
@@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
CPPFLAGS+= -I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
CFLAGS+= -I${GNUSTEP_SYSTEM_ROOT}/Library/Headers
LDFLAGS+= -L${GNUSTEP_SYSTEM_ROOT}/Library/Libraries
-CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE="${GMAKE}"
+CONFIGURE_ENV+= MAKE="${GMAKE}"
CONFIGURE_ENV+= GNUSTEP_SYSTEM_HEADERS="${GNUSTEP_SYSTEM_ROOT}/Library/Headers"
BASEDIR= ${WRKSRC}/nextstep/build/Emacs.app
CONFIGURE_ARGS+= --without-gcc --with-ns --without-x --with-pop \
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index a8a52a5b0071..701fc0d5f283 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -31,8 +31,8 @@ EMACS_VER= 23.3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=/var
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index dbd151fbe609..f5910efc6aa7 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -62,7 +62,6 @@ LATEST_LINK= emacs21
.if ${ARCH} == "ia64"
CFLAGS:= ${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}"
.endif
pre-everything::
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index a8a52a5b0071..701fc0d5f283 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -31,8 +31,8 @@ EMACS_VER= 23.3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=/var
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/editors/fxite/Makefile b/editors/fxite/Makefile
index 1a7569489ec7..406b43785f0a 100644
--- a/editors/fxite/Makefile
+++ b/editors/fxite/Makefile
@@ -22,7 +22,6 @@ USE_PKGCONFIG= yes
GNU_CONFIGURE= yes
CXXFLAGS+= -g -O0 -fPIC
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-system-lua \
--with-lua-pkg=lua-${LUA_VER}
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 80124e3652a9..7ddfd62da9bc 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gnomeprefix intlhack gnomevfs2
WANT_GNOME= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas \
gedit-drawspaces.schemas
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 3758401e6d7d..bd31ad794ce0 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
desktopfileutils gnomedocutils ltasneededhack
GNOME_DESKTOP_VERSION=2
WANT_GNOME= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="2.20"
MAN1= gedit.1
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 0771110625e0..0a5222437baf 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= ghex2.schemas
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index db5db41ca255..26c379b90e5f 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-regex
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I/usr/include/gnu" \
- LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+= -I${LOCALBASE}/include -I/usr/include/gnu
.if exists(/usr/lib/libcrypto.a)
PYTHON_LIBS= -lssl -lcrypto
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 4c359acfe8b8..6226c977bb34 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -18,8 +18,8 @@ USE_GNOME= gnomehack gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gmanedit.1
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index d4849b3c2e62..932d07cff14c 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -27,13 +27,12 @@ WANT_GNOME= yes
USE_GNOME= gnomeprefix gtk12
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
MAN1= gnp.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCVERSION= 1.2.0
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 76e00dce175c..2e0e574fdb52 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=--without-gtkspell
.endif
.if !defined(WITHOUT_NLS)
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --enable-nls
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile
index f2327c143c6a..b9b204b8b43d 100644
--- a/editors/gphpedit/Makefile
+++ b/editors/gphpedit/Makefile
@@ -19,8 +19,8 @@ COMMENT= PHP, HTML and CSS development environment for GNOME 2.x
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
.if !defined(WITHOUT_PHP)
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index eda55f447b9f..aaeeabd6cce5 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -39,7 +39,8 @@ PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS+=--disable-x11-textmode
.else
USE_XORG= x11
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
.if !defined(NOPORTDOCS)
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 599c3268cb4f..071b35aeb98e 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_NCURSES= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
ALL_TARGET= ${PORTNAME}
MAN1= ${PORTNAME}.1
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index f2655395e469..4036229d9f69 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -21,8 +21,8 @@ CONFLICTS= joe-3*
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
ALL_TARGET= ${PORTNAME}
MAN1= ${PORTNAME}.1
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 09d5028f9ac1..8a292f3e64c8 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -18,11 +18,10 @@ USE_GNOME= gtk20 desktopfileutils intlhack
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-chooser
INSTALLS_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 35794337bcc0..ae59ed24b2d1 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -222,8 +222,7 @@ MANCOMPRESSED= yes
.include <bsd.port.options.mk>
-LDFLAGS=
-MAKE_ENV+= USE_GMAKE=1 DESTDIR=${LODESTDIR}
+MAKE_ENV+= USE_GMAKE=1 DESTDIR=${LODESTDIR}
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} -L${LOCALBASE}/lib
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index ab88d84b1b4b..356782fbd62c 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -20,7 +20,8 @@ USE_AUTOTOOLS= autoconf libtool
USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview libgnomeui
USE_GMAKE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`" LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`
GCONF_SCHEMAS= mlview.schemas
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index ff0ea9138100..f8a3d6732a90 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -24,7 +24,8 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
OPTIONS= XULRUNNER "Install xulrunner as JavaScript engine" off
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gconf=auto
USE_GETTEXT= yes
USE_GNOME= gconf2 libgtkhtml libxslt
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 943f1006b3d9..a1ce02532409 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -17,8 +17,8 @@ COMMENT= Nano's ANOther editor, an enhanced free Pico clone
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --docdir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
LICENSE= GPLv3
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 653081c344e7..432ac5ecc8f7 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --enable-widechar
.endif
CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${BDB_LIB_DIR} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib
# configure is 555, so you can't do a "make configure" as non-root.
post-patch:
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 4243cd2344cc..de7a5c74c6db 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -115,9 +115,9 @@ OOOCC= ${CC}
OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 9f2521b5df64..e1d38d4c7df1 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -105,9 +105,9 @@ OOOCC= ${CC}
OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index f216db1c825c..bd9fb93de80b 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -106,9 +106,9 @@ OOOCC= ${CC}
OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 4243cd2344cc..de7a5c74c6db 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -115,9 +115,9 @@ OOOCC= ${CC}
OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 9f2521b5df64..e1d38d4c7df1 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -105,9 +105,9 @@ OOOCC= ${CC}
OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 6490b5bfc893..fa46a0d5edc6 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -70,9 +70,9 @@ OOOCXX= ${CXX}
.endif
CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
PATH=${WRKSRC}/solenv/bin:$$PATH
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 9c360c86e361..6f442353ff84 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -28,14 +28,13 @@ WITH_BDB_HIGHEST= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- WXRC="${WXRC_CMD}"
+CONFIGURE_ENV= WXRC="${WXRC_CMD}"
INSTALLS_ICONS= yes
MAN1= poedit.1
-CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile
index 08476e4ddb82..758a08593b7d 100644
--- a/editors/rospell/Makefile
+++ b/editors/rospell/Makefile
@@ -23,7 +23,7 @@ USE_XORG= x11 xext
USE_QT_VER= 3
MAKE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
MAKEFILE= BSDmakefile
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index 305dfcd50bdb..c670718aa200 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_GNOME= pygnomedesktop pygnomeextras gnomeprefix
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= scribes.schemas
INSTALLS_ICONS= yes
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index cfbf7881cc7a..6fcd447f4d56 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -28,8 +28,8 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_GHOSTSCRIPT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-optimize="${CXXFLAGS}" \
--with-iconv="${LOCALBASE}"
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 02d4738d287f..2c30466ca39f 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -21,7 +21,7 @@ USE_TK_BUILD= yes
USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${DISTNAME}/build
CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/tk${TK_VER}
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 05f7577cbecc..b8aff2a6d9b9 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -40,8 +40,8 @@ LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile
index 8361f6e2c5f7..125b9e4f0ed5 100644
--- a/editors/xmleditor/Makefile
+++ b/editors/xmleditor/Makefile
@@ -21,8 +21,8 @@ USE_BISON= build
USE_GNOME= gnomehack libglade
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-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}"
USE_LDCONFIG= yes
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 1553914cd125..a5ddf19269ec 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= gc:${PORTSDIR}/devel/boehm-gc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-included-regex
MAN1= ${PORTNAME}.1
diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile
index f6187ed3c5ba..a53b9337a8bd 100644
--- a/emulators/advancemame/Makefile
+++ b/emulators/advancemame/Makefile
@@ -19,8 +19,8 @@ USE_GL= yes
USE_GMAKE= yes
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -idirafter ${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -idirafter ${LOCALBASE}/include
OPTIONS= FREETYPE "Enable FreeType2 support" off \
SLANG "Enable sLang support (for video driver)" off
diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile
index 302590b10ced..f9423f847aad 100644
--- a/emulators/advancemenu/Makefile
+++ b/emulators/advancemenu/Makefile
@@ -19,7 +19,8 @@ USE_GL= yes
USE_GMAKE= yes
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= FREETYPE "Enable FreeType2 support" off \
SLANG "Enable sLang support (for video driver)" off
diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index ba9e25f919ab..a4ea872a7f00 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -20,8 +20,8 @@ USE_GL= yes
USE_GMAKE= yes
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -idirafter ${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -idirafter ${LOCALBASE}/include
OPTIONS= FREETYPE "Enable FreeType2 support" off \
SLANG "Enable sLang support (for video driver)" off
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 9751b480dd34..7804e83c1741 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -26,12 +26,11 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= atari800.1
CFLAGS+= -I${LOCALBASE}/include/libpng
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
ATARI_XF= ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
demos2.xfd dos25.xfd mydos45d.atr
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 262789e02fdb..461a54d7dd72 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-docbook
OPTIONS= A20_PIN "Enable support for A20 pin" on \
@@ -73,8 +72,8 @@ OPTIONS= A20_PIN "Enable support for A20 pin" on \
CFLAGS+= -fno-exceptions -fomit-frame-pointer ${CPPFLAGS}
CXXFLAGS+= -fno-rtti
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MANCOMPRESSED= yes
MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1
diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile
index b1d386764d19..f2405e12937c 100644
--- a/emulators/cingb/Makefile
+++ b/emulators/cingb/Makefile
@@ -17,14 +17,13 @@ COMMENT= Yet another Nintendo GameBoy(tm) emulator
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= x11 xext
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
ALL_TARGET= standard
PORTDOCS= README README.FAQ
PLIST_FILES= bin/cingb bin/cingb_conf
-CPPFLAGS= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index cb8521e13915..b216ead873c3 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -24,7 +24,6 @@ MAN1= dosbox.1
PKGMESSAGE= ${WRKDIR}/pkg-message
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS+= --enable-core-inline
post-patch:
diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile
index 2545bcfa26ff..ca4022b19a06 100644
--- a/emulators/dynamips-community/Makefile
+++ b/emulators/dynamips-community/Makefile
@@ -32,8 +32,7 @@ MAKE_ENV= \
DYNAMIPS_CODE=${DYNAMIPS_CODE} \
DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \
PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
- PTHREAD_LIBS=${PTHREAD_LIBS} \
- LDFLAGS="${LDFLAGS}"
+ PTHREAD_LIBS=${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile
index f5ec350007c2..fa8d8713d02d 100644
--- a/emulators/dynamips-devel/Makefile
+++ b/emulators/dynamips-devel/Makefile
@@ -24,8 +24,7 @@ USE_GMAKE= yes
ALL_TARGET= ${PORTNAME} nvram_export
MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\
PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\
- PTHREAD_LIBS=${PTHREAD_LIBS}\
- LDFLAGS="${LDFLAGS}"
+ PTHREAD_LIBS=${PTHREAD_LIBS}
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/${PORTNAME} bin/nvram_export
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 83b66e287cd9..518f12cc76a5 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -20,8 +20,7 @@ USE_GMAKE= yes
ALL_TARGET= ${PORTNAME} nvram_export
MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\
PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\
- PTHREAD_LIBS=${PTHREAD_LIBS}\
- LDFLAGS="${LDFLAGS}"
+ PTHREAD_LIBS=${PTHREAD_LIBS}
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/${PORTNAME} bin/nvram_export
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 41d733847c16..fdfd81fccbf6 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -22,7 +22,6 @@ ALL_TARGET= Frodo
WRKNAME= Frodo-4.1b
WRKSRC= ${WRKDIR}/${WRKNAME}/Src
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
.if !defined(WITHOUT_SDL)
USE_SDL= sdl
.endif
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 1047fe934b34..e83bdfcc43b8 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE= yes
USE_GNOME= libxml2 glib20 gtk20
CONFIGURE_ARGS+=--without-alsa --without-joystick
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
MAN1= fuse.1
diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile
index 6189f89e4085..1dbbe2dd121a 100644
--- a/emulators/gbe/Makefile
+++ b/emulators/gbe/Makefile
@@ -18,12 +18,11 @@ COMMENT= Nintendo GameBoy(tm) emulator with GNU source code
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= x11
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/gbe
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gbe ${PREFIX}/bin
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index 2ffdb903e934..959ea7591095 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -32,8 +32,8 @@ OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
CONFIGURE_ARGS+=--with-gtk
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/${PORTNAME}${PKGNAMESUFFIX}-gtk
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 9aab06cc0167..9ddc09479433 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -21,8 +21,8 @@ USE_SDL= sdl
USE_GMAKE= 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-gtk
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile
index 0afd85672143..cbd1ca3cff45 100644
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@@ -17,12 +17,11 @@ COMMENT= GameBoy(tm) emulator
USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/gngb
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gngb.1
diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index bddebd630d0d..fcfc98ec0f40 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -21,11 +21,10 @@ USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name="" --disable-gp2x
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_JOBS_UNSAFE= yes
-CPPFLAGS= ${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
-LDFLAGS= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
+CPPFLAGS+= ${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
SUB_FILES= pkg-message
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 6e2f9e0bf6ee..b2012efb2a3f 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -23,15 +23,14 @@ LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib
USE_SDL= sdl
USE_XORG= x11
USE_AUTOTOOLS= autoconf
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-sdl
MAKE_JOBS_SAFE= yes
PORTDOCS= *
PLIST_FILES= bin/sdlgnuboy bin/sgnuboy bin/xgnuboy
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
do-install:
.for file in sdlgnuboy sgnuboy xgnuboy
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 4b08f4fd7035..53ab5efd587d 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gtk20 intlhack gnomehack gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-xmame-dir=${LOCALBASE}/share/xmame
.if defined(WITHOUT_NLS)
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 2b5b9a22355e..e8912aff04a6 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}"
.if !defined(WITHOUT_NETPLAY)
USE_SDL+= net
diff --git a/emulators/jzintv/Makefile b/emulators/jzintv/Makefile
index 75bfaeda6e3f..f63185db57eb 100644
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@@ -25,7 +25,6 @@ USE_SDL= sdl
USE_ZIP= yes
CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
OPTIONS= TOOLS "Install additional tools" off
TOOLS= as1600 crc32 dasm1600 dis1600 frombit_r gms2rom imvtoppm rom2bin \
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index d976cbd3c8be..39eb2edf61a4 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -27,7 +27,6 @@ USE_XORG= x11
USE_GL= glut
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
WRKSRC= ${WRKDIR}/${PORTNAME}
SUB_FILES= pkg-message
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index a45d3f4f40b5..4434fe422d85 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -18,8 +18,7 @@ COMMENT= A collection of tools for manipulating MSDOS files
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_header_malloc_h=no
+CONFIGURE_ENV= ac_cv_header_malloc_h=no
CONFIGURE_ARGS= --enable-xdf
SUB_FILES= pkg-message
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index ed459c5ce6eb..8809c6ae295b 100644
--- a/emulators/o2em/Makefile
+++ b/emulators/o2em/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/o2em117src
MAKEFILE= Makefile.freebsd
USE_ZIP= yes
USE_GMAKE= yes
-MAKE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
post-extract:
@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|h|txt)" -print0 | \
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 344b627b924a..485d47b94081 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -42,8 +42,8 @@ CONFIGURE_ARGS+= --disable-unity
.endif
LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
CONFIGURE_ARGS+= --with-x
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_XORG= x11 ice sm xext xineramaproto xinerama xrandr xrender \
xtst
USE_GNOME= gtk20 glib20
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 5c22eeef8710..75aa67f0b238 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -33,7 +33,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_CSTD= gnu89
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opengl --enable-libcdio
USE_LDCONFIG= yes
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 038d2c0e795a..41aabe13e02e 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -30,7 +30,7 @@ USE_PYTHON= yes
USE_GNOME= glib20
USE_PERL5_BUILD= yes
PATCH_STRIP= -p1
-MAKE_ENV+= BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= BSD_MAKE="${MAKE}"
MAN1= qemu.1 qemu-img.1
MAN8= qemu-nbd.8
ONLY_FOR_ARCHS= amd64 i386 powerpc # XXX someone wants to debug sparc64 hosts?
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index d99a5b77fc64..7badffb722dc 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -21,7 +21,7 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
PATCH_STRIP= -p1
-MAKE_ENV+= BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= BSD_MAKE="${MAKE}"
MAN1= qemu.1 qemu-img.1
ONLY_FOR_ARCHS= amd64 i386
CONFLICTS= qemu-devel-[0-9]*
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 1c8c47ec268b..212bd8626c49 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= gtk20 desktopfileutils pkgconfig intltool libglade2 libxml2
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_SDL= sdl
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --without-alsa
WRKSRC= ${WRKDIR}/${DISTNAME}/gtk
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 449b5e87533a..5aecba0af2eb 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -23,8 +23,8 @@ USE_XORG= x11 sm ice xext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-extensions
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${LOCALBASE}/include \
${PTHREAD_CFLAGS}" LDLIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
OPTIMISE="${CXXFLAGS}"
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 0909f77f107c..0f3e6cdccddb 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -22,8 +22,8 @@ USE_SDL= sdl
USE_GMAKE= yes
HAS_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index f727882bd47b..d1c77d41ca09 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -28,7 +28,6 @@ USE_SDL= sdl
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic
CONFIGURE_ARGS= --disable-gdb
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= tiemu.1
diff --git a/emulators/tpm-emulator/Makefile b/emulators/tpm-emulator/Makefile
index 9f470fcb0f71..59abc44dabf2 100644
--- a/emulators/tpm-emulator/Makefile
+++ b/emulators/tpm-emulator/Makefile
@@ -32,8 +32,8 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
CONFIGURE_WRKSRC= ${CMAKE_SOURCE_PATH}/build
CMAKE_ENV= PREFIX=${PREFIX} ${CONFIGURE_ENV}
-CMAKE_ARGS= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
- -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+CMAKE_ARGS= -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_LIST= USERS=${USERS} GROUPS=${GROUPS}
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 0e0b3bd1aa7e..62a88cb92e93 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -56,7 +56,6 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ENV+= PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
CONFIGURE_ARGS+= --enable-fullscreen --enable-ipv6 --disable-dependency-tracking
MAN1= vice.1 c1541.1 petcat.1
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index b6e3e6386c20..dcc9279b8077 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -17,8 +17,8 @@ COMMENT= A visual simulator of an operating system to help understand how OSes w
USE_GNOME= gnomehack gnomeprefix libglade
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= VisualOS.1
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index c4d207792e50..3f278370a351 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -28,7 +28,8 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
png.6:${PORTSDIR}/graphics/png \
xml2:${PORTSDIR}/textproc/libxml2
-CPPFLAGS= "-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--verbose --disable-tests \
--without-alsa --without-capi --with-glu \
@@ -36,8 +37,7 @@ CONFIGURE_ARGS+=--verbose --disable-tests \
--with-opengl --without-mpg123 --with-oss --without-sane \
--without-v4l --without-xcomposite --without-xinerama \
--with-xinput2 --with-xrandr
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- FLEX="${LOCALBASE}/bin/flex"
+CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex"
WINELIBDIR?= ${PREFIX}/lib
.if !defined(USE_LDCONFIG32)
USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index c4d207792e50..3f278370a351 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -28,7 +28,8 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
png.6:${PORTSDIR}/graphics/png \
xml2:${PORTSDIR}/textproc/libxml2
-CPPFLAGS= "-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--verbose --disable-tests \
--without-alsa --without-capi --with-glu \
@@ -36,8 +37,7 @@ CONFIGURE_ARGS+=--verbose --disable-tests \
--with-opengl --without-mpg123 --with-oss --without-sane \
--without-v4l --without-xcomposite --without-xinerama \
--with-xinput2 --with-xrandr
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- FLEX="${LOCALBASE}/bin/flex"
+CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex"
WINELIBDIR?= ${PREFIX}/lib
.if !defined(USE_LDCONFIG32)
USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 710ea2df0a4a..e416f90d1ef1 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -20,7 +20,7 @@ COMMENT= An HP48 SX/GX graphic calculator emulator
LICENSE= GPLv3
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LIBS=-lutil
USE_GMAKE= yes
USE_XORG= x11 xext xt
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index 9c61e3b65891..ebd6a1732576 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -15,7 +15,8 @@ MAINTAINER= pixel@hugbox.org
COMMENT= A portable Amstrad 464&/664/6128 emulator
HAS_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--prefix=${PREFIX}
USE_XORG= ice
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index b414c7a7b60e..187fab3783da 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -35,8 +35,8 @@ CONFIGURE_ARGS= --without-included-gettext \
--with-cachesize=20 \
--enable-midi=seq,extp,raw \
--enable-cdrom=bsd,mp3
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if ${HAVE_GNOME:Mesound}!=""
USE_GNOME+= esound
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 02316eedb770..5fd614d4dd6b 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -36,7 +36,6 @@ USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-cpucheck
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= zsnes.1
PLIST_FILES= bin/zsnes
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 4b8af49b5aa7..ceeb7271128d 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -30,7 +30,6 @@ OPTIONS= APIDOC "Full API documentation (requires Doxygen)" off \
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-release="yes"
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 354ab482debc..ac22c38b0e58 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -19,8 +19,8 @@ USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-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/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 55d348f27400..ce13df912542 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -24,6 +24,6 @@ INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= libxml2 gnomehier
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index b7da8a7f96bb..ad6eca69d013 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -45,7 +45,7 @@ USE_GNOME= gnomeprefix libglade2 libgnomeui
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-error-on-warning \
--disable-doxygen
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 90981ceee6af..3c5bdece257f 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -27,8 +27,8 @@ INSTALLS_ICONS= yes
MAN1= grisbi.1
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index f01e4134a321..9449e7b7fb7a 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -22,11 +22,10 @@ USE_GNOME= desktopfileutils gnomehier gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile
index 81851c22a6ed..a03c03f80eb7 100644
--- a/finance/ledger/Makefile
+++ b/finance/ledger/Makefile
@@ -25,7 +25,6 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/w3c-libwww
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
NO_INSTALL_MANPAGES= yes
INFO= ledger
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index 163b03c52611..ba180048661c 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -21,15 +21,14 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I m4
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \
--with-opensp-includes=${LOCALBASE}/include/OpenSP \
--with-opensp-libs=${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile
index 5d121194debb..b8b492fdb32a 100644
--- a/finance/quantlib/Makefile
+++ b/finance/quantlib/Makefile
@@ -21,9 +21,8 @@ WRKSRC= ${WRKDIR}/QuantLib-${PORTVERSION}
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CPPFLAGS= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
USE_LDCONFIG= yes
MAN1= quantlib-config.1 quantlib-test-suite.1
diff --git a/finance/quantlib/pkg-plist b/finance/quantlib/pkg-plist
index b3b55ea37540..aa7dce96f059 100644
--- a/finance/quantlib/pkg-plist
+++ b/finance/quantlib/pkg-plist
@@ -1,4 +1,5 @@
bin/quantlib-config
+bin/quantlib-test-suite
include/ql/auto_link.hpp
include/ql/cashflow.hpp
include/ql/cashflows/all.hpp
diff --git a/french/med/Makefile b/french/med/Makefile
index f97c9d3bf5a3..d25836a3f26b 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -27,8 +27,10 @@ SHORT_TK_VER= ${TK_VER:S/.//}
USE_FORTRAN= yes
FFLAGS+= -O2
-CONFIGURE_ENV= HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}" \
- LDFLAGS="${PTHREAD_LIBS}" WISH=${LOCALBASE}/bin/wish${TK_VER}
+CONFIGURE_ENV= HDF5HOME=${LOCALBASE} \
+ WISH=${LOCALBASE}/bin/wish${TK_VER}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-f90=${FC} --docdir=${DOCSDIR}
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index 67fbd6de8f86..40fb054c29d0 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -23,9 +23,8 @@ USE_GNOME= gnomehack ltverhack libxml2
USE_ICONV= yes
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= french-conjugator.1 french-deconjugator.1
MAN3= verbiste.3
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 842c414eed45..bc437ae9c503 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -151,7 +151,6 @@ CONFIGURE_ARGS+= --enable-ldap
USE_OPENLDAP= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-ADDFLAGS= true
.if defined(WITH_LDAPS)
CONFIGURE_ARGS+= --enable-ldaps
.else
@@ -205,9 +204,6 @@ CONFIGURE_ARGS+= --disable-proxy
.endif
CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
-.if defined(ADDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif
DOCS= BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES \
HISTORY INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS \
diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index 8e2596fe34b5..5ff5a95352b4 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -19,8 +19,8 @@ COMMENT= A C++ wrapper for libcurl
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-ewarning --without-boost
USE_LDCONFIG= yes
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 806488734f9c..d56becf9fc68 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -33,7 +33,7 @@ WX_CONF_ARGS= relative
WX_UNICODE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAN1= filezilla.1 fzputtygen.1 fzsftp.1
diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index ba51e0174412..86c5eca2a881 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -57,7 +57,7 @@ WITH_CCP= yes
CONFIGURE_ARGS+= --enable-ipfilter
.endif
.if defined(WITH_PF)
-CONFIGURE_ENV+= "CPPFLAGS=-DPF"
+CPPFLAGS+= -DPF
.endif
.if defined(WITH_VIRUS_SCAN)
CONFIGURE_ARGS+= --enable-virus-scan
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index c027a1ba645f..5fa5eb572e49 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -19,8 +19,8 @@ COMMENT= A free multithreaded GTK-based GUI ftp and sftp client
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-included-gettext
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
WANT_GNOME= yes
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 760bedad7565..607229f7b77c 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= gnomeprefix gnomehack gtk20 gconf2 libgnomeui \
desktopfileutils
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= ${PORTNAME}.schemas
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 286118a9e8e4..187a10ce67ca 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -24,7 +24,8 @@ USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE} LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE}
+LDFLAGS+= ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's|-O2|-fPIC|g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 6ead7bedb296..2f361b6cb280 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -18,15 +18,14 @@ USE_BZIP2= yes
WANT_GNOME= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-locale-dir=${PREFIX}/share/locale \
--disable-debug --disable-gnome --disable-js \
--enable-utf-8 --enable-threads
MAN1= pavuk.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/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 95cc57d9ffab..ef05507d142c 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -20,11 +20,10 @@ USE_FAM= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PORTDOCS= index.txt introduction.txt main_window.txt \
preferences.txt user_manager.txt
diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile
index 3efcfa01ecd4..e212ac85fa34 100644
--- a/ftp/quftp/Makefile
+++ b/ftp/quftp/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline
GNU_CONFIGURE= yes
CFLAGS+= ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}"
MAN1= quftp.1
PLIST_FILES= bin/quftp
diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index da0bf73fa233..bd4057e051ea 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-rexx=regina
USE_LDCONFIG= yes
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index e3376c9f3dc6..ab08b4b65f10 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -20,7 +20,7 @@ USE_GNOME= gtk20 lthack
WANT_GNOME= yes
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
index 8ae8bf2f907c..8d32a735e703 100644
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@@ -51,8 +51,6 @@ WITH_OPENSSL_PORT= yes
SSL_SUFFIX= -ssl
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
-.else
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
.endif
do-configure:
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 4a9d2ece1d53..bf112a31b176 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -40,8 +40,6 @@ USE_RC_SUBR= vsftpd.sh
SSL_SUFFIX= -ssl
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
-.else
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_PIDFILE)
diff --git a/ftp/wgetpro/Makefile b/ftp/wgetpro/Makefile
index 421a7d31818d..405f937c13ba 100644
--- a/ftp/wgetpro/Makefile
+++ b/ftp/wgetpro/Makefile
@@ -20,7 +20,6 @@ RESTRICTED= "may implement United States Patent 6,041,345"
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index 9e7675c981e0..bea0d7535b2b 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -20,9 +20,8 @@ PORTEXAMPLES= USAGE.examples USAGE.resumehandling USAGE.urlhandling \
passwordfile wputrc
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="${LDFLAGS}"
+CONFIGURE_ENV= LIBS="${LDFLAGS}"
+CFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE=yes
OPTIONS= TLS "Enable TLS support" On \
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 7081df973aed..a7004582f3b2 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig ltverhack
CONFIGURE_ARGS+= --without-pam --disable-pgsql --disable-bonjour
-CONFIGURE_ENV= CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PKGMESSAGE= ${WRKDIR}/pkg-message
OPTIONS= UTF8 "Enable UTF8 support" off \
diff --git a/games/8kingdoms/Makefile b/games/8kingdoms/Makefile
index 613fcbf0505d..37cd62f00aba 100644
--- a/games/8kingdoms/Makefile
+++ b/games/8kingdoms/Makefile
@@ -26,7 +26,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --datadir=${DATADIR}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST= ${WRKDIR}/pkg-plist
SUB_FILES= pkg-message
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index 1a7854a2cb05..d179a5151f0e 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -22,13 +22,12 @@ USE_GL= gl
USE_SDL= mixer sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-assetdir=${DATADIR} --enable-release
MAKE_JOBS_SAFE= yes
MAN6= abuse.6 abuse-tool.6
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 92d5c3e9a226..eb7e74156398 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -27,8 +27,8 @@ USE_SDL= sdl
USE_XORG= xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
CONFIGURE_ARGS= --enable-compile-optim=no
USE_LDCONFIG= yes
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 2fd1876d0303..7350900bada4 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -24,14 +24,13 @@ USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- PYPACKAGE="${PYTHON_CMD}" ac_cv_path_P_SWIG=no
+CONFIGURE_ENV= PYPACKAGE="${PYTHON_CMD}" ac_cv_path_P_SWIG=no
CONFIGURE_ARGS= --disable-py-debug
PLIST_SUB= VERSION="${PORTVERSION:R}"
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
WEDGE_VERSION= 0.3.4
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index 352fb0c30a37..48161af009c6 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -20,9 +20,8 @@ LICENSE= GPLv2
USE_SDL= mixer sdl
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= afternoonstalker.6
PORTDOCS= AUTHORS COPYING INSTALL NEWS README THANKS TODO
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 05c4e7a34f31..5ae8a18b0f01 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -26,8 +26,8 @@ USE_DOS2UNIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.51/
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS+=--with-xf86vm \
--with-xf86dga
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index f7f9d3f218f5..b4a96822127f 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -35,8 +35,8 @@ USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --datadir=${DATADIR}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/antrix/Makefile b/games/antrix/Makefile
index 54044cc9a3c9..9f3bb563a205 100644
--- a/games/antrix/Makefile
+++ b/games/antrix/Makefile
@@ -27,7 +27,6 @@ USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
run-autotools-automake:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS})
diff --git a/games/apricots/Makefile b/games/apricots/Makefile
index fbd3bf5d6afd..6f550b8b8a44 100644
--- a/games/apricots/Makefile
+++ b/games/apricots/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE= yes
USE_SDL= sdl
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= README
diff --git a/games/asc/Makefile b/games/asc/Makefile
index e6b4e66b29c4..0a33bf650768 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -37,7 +37,6 @@ LUA_COMPS= lua
USE_PERL5_BUILD=yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN6= asc.6 asc_demount.6 asc_mapedit.6 asc_mount.6 \
asc_weaponguide.6
@@ -47,8 +46,8 @@ PLIST_FILES= bin/asc bin/asc_demount bin/asc_mapedit bin/asc_mount \
PLIST_DIRS= ${ASC_MUSICDIR} %%DATADIR%%
CFLAGS+= -D_UNICODE_BROKEN_
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 4380d5117e78..ce0ea20d0165 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -21,8 +21,8 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
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/games\.games/games:games/' ${WRKSRC}/Makefile.in
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 3f863cd4f266..c1aceb4fd15e 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -28,13 +28,11 @@ USE_XORG= xmu xi x11
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sound
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
USE_AUTOTOOLS= automake autoconf
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/games/belooted/Makefile b/games/belooted/Makefile
index 63900f5df60f..6a6e6867944b 100644
--- a/games/belooted/Makefile
+++ b/games/belooted/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= gtk20 desktopfileutils
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
diff --git a/games/bitefusion/Makefile b/games/bitefusion/Makefile
index 33de52ee1776..459dd102e4b8 100644
--- a/games/bitefusion/Makefile
+++ b/games/bitefusion/Makefile
@@ -17,8 +17,8 @@ COMMENT= A snake game with 8 levels
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl
-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
PLIST_FILES= bin/bitefusion
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 91449a9f0545..6c5209df6dc4 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE= yes
USE_GL= gl
USE_WX= 2.6+
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKEFILE= makefile
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 6ec14cc621ba..5eda26914ccd 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=""
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
post-extract:
${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf ;
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index d6ab52a793c5..1ec8ef600aee 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
pre-patch:
@${FIND} ${WRKSRC} -name "*.[ch]" | \
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index 9fa6d8ad5205..fd345baebe22 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -18,8 +18,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -fpermissive
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index 6ae0c09a6068..9aad4d23e410 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -19,8 +19,8 @@ WANT_GNOME= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \
- LDFLAGS="`${SDL_CONFIG} --libs`"
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= `${SDL_CONFIG} --libs`
CONFIGURE_ARGS= --program-transform-name=
OPTIONS= EDITOR "Enable building of the map editor" on \
diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index afc69c5afd0c..58aa1be9694b 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -26,7 +26,8 @@ USE_GMAKE= yes
USE_GNOME= desktopfileutils
USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/games/bumprace/Makefile b/games/bumprace/Makefile
index eeaec6ec0a1e..399f9850492c 100644
--- a/games/bumprace/Makefile
+++ b/games/bumprace/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer image
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= FAQ README
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 243b4fef6316..91f189995b73 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -20,9 +20,8 @@ LICENSE= GPLv2
USE_SDL= mixer sdl
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= burgerspace.6 burgerspace-server.6
PORTDOCS= AUTHORS COPYING INSTALL NEWS README THANKS TODO
diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile
index b18b50aeefdc..32b3f51d95a6 100644
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -25,8 +25,8 @@ USE_GL= glu
USE_GMAKE= yes
USE_GCC= 4.2+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`fltk-config --cxxflags`" \
- LDFLAGS="`fltk-config --ldflags`"
+CPPFLAGS+= `fltk-config --cxxflags`
+LDFLAGS+= `fltk-config --ldflags`
MAKE_JOBS_SAFE= yes
LICENSE= GPLv3
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index dba8aa4566bd..8970d67e5a82 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gtk20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 0b20732c18d2..d3606c2a232e 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -21,7 +21,8 @@ USE_GL= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile
index aaeca9bb7f2a..8fa914670860 100644
--- a/games/ceferino/Makefile
+++ b/games/ceferino/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CEFEDIRS= ima music levels sounds
diff --git a/games/chanta/Makefile b/games/chanta/Makefile
index b717e2cb37cd..8820ffdc83ef 100644
--- a/games/chanta/Makefile
+++ b/games/chanta/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CHANTADIRS= data ima
diff --git a/games/chroma/Makefile b/games/chroma/Makefile
index 45bdbc437e97..df849a08cf8b 100644
--- a/games/chroma/Makefile
+++ b/games/chroma/Makefile
@@ -19,8 +19,9 @@ USE_BZIP2= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV= LIBS="-lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= README
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index c2c08a70cb2e..6105b82ece92 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= glpng.1:${PORTSDIR}/graphics/glpng \
GNU_CONFIGURE= yes
USE_GL= gl glu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-glc
MAKE_JOBS_SAFE= yes
diff --git a/games/concentration/Makefile b/games/concentration/Makefile
index c3b52c290820..5753a187f876 100644
--- a/games/concentration/Makefile
+++ b/games/concentration/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer image ttf
-CONFIGURE_ENV= LDFLAGS="`${SDL_CONFIG} --libs`" \
- CPPFLAGS="`${SDL_CONFIG} --cflags`" \
- SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= `${SDL_CONFIG} --libs`
MAN6= concentration.6
diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile
index 884fb7866479..163f0b4badaa 100644
--- a/games/connectfive/Makefile
+++ b/games/connectfive/Makefile
@@ -16,9 +16,9 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Place five pieces in a row on a 3d board
MAKEFILE= Makefile.linux
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
ALL_TARGET= default
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
USE_SDL= sdl
USE_GL= gl
diff --git a/games/construo/Makefile b/games/construo/Makefile
index f074c8819086..5090d2bbb76e 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_XORG= sm ice x11 xext xxf86vm
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${DATADIR}
OPTIONS= GLUT "Use glut" on
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 43c66037999d..f7a78b8cf78e 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= corewars.6
MLINKS= corewars.6 corewars-cmd.6
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index d01324f5ab9b..45c9bf3e92ca 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -26,8 +26,8 @@ USE_XORG= x11 xau xdmcp
USE_ICONV= yes
USE_GNOME= desktopfileutils
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`"
+CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
MAN6= cosmosmash.6
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index f249e579b1d5..83b52f43f9f6 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -17,7 +17,7 @@ COMMENT= OpenGL game based on Super Nintendo classic Tetris Attack
USE_GL= glut
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" CXXFLAGS="${CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN6= crack-attack.6
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index 65a64dfb2b04..c48985e92941 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:env aclocal:env automake:env libtool
USE_SDL= sdl
USE_GL= gl
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-system-ftgl
USE_GCC= 4.2+
MAKE_JOBS_SAFE= yes
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 0fbac50e5209..db1fcc806524 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -26,8 +26,8 @@ WANT_GNOME= yes
USE_GMAKE= yes
USE_SDL= image sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-sound-dir=${DATADIR}/sounds
MAN6= cfclient.6
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index b43c4fa3f393..a28df53add9c 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -30,14 +30,13 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-check=no
MAN6= crossfire-config.6 crossfire-server.6 crossloop.6 \
crossloop.web.6
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-extract:
@${CHMOD} a+x ${WRKSRC}/utils/install-sh
diff --git a/games/crrcsim/Makefile b/games/crrcsim/Makefile
index 53efac00e12d..7974604a9f49 100644
--- a/games/crrcsim/Makefile
+++ b/games/crrcsim/Makefile
@@ -23,8 +23,8 @@ USE_SDL= sdl
USE_GL= gl glu
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib"\
- CPPFLAGS="-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
PORTDOCS= *
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index e21a99e17483..54731ec79418 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -21,8 +21,8 @@ USE_GL= yes
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/SDL
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 34f8f13130d3..a0fd75902cdb 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -53,7 +53,8 @@ BROKEN= does not compile
.if !defined(WITHOUT_OPENGL)
USE_GL= gl glu
CONFIGURE_ARGS+=--with-opengl
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
do-extract:
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 966f0d5db75c..fc0c986e89a8 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -26,7 +26,8 @@ PLIST_FILES= bin/d2x
.ifdef(WITH_OPENGL)
USE_GL= glut
CONFIGURE_ARGS+=--with-opengl
-CONFIGURE_ENV=LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
pre-everything::
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index c34a5f64d89d..92930193d4a5 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -22,7 +22,7 @@ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --disable-simplelayout --enable-getaddrinfo
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_AUTOTOOLS= automake autoconf
USE_SDL= mixer image
SUB_FILES= daimonin.sh
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 4aaf0ad06b16..464e12bfcec2 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -26,8 +26,8 @@ USE_PYTHON= yes
WRKSRC= ${WRKDIR}/gamediameter
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \
- LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
+CPPFLAGS+= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
DATADIR= ${PREFIX}/share/gamediameter
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index c721b0b049ea..bc68f24e2df9 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
USE_GNOME= gtk12
CONFIGURE_ARGS= --enable-networking --disable-plugins --localstatedir=${DATADIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL LICENCE NEWS README TODO
MAN6= dopewars.6
diff --git a/games/duel/Makefile b/games/duel/Makefile
index a9e7538fe5b9..2ed692625e64 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -24,8 +24,8 @@ USE_BZIP2= yes
USE_GL= gl
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${LOCALBASE}/include -I${LOCALBASE}/include/FTGL" \
- LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
+CPPFLAGS+= `${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${LOCALBASE}/include -I${LOCALBASE}/include/FTGL
+LDFLAGS+= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}
SUB_FILES= ${PORTNAME}-sh
diff --git a/games/ember/Makefile b/games/ember/Makefile
index 47db1c795361..402c7ba71bcc 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -42,7 +42,7 @@ LUA_COMPS= toluaxx
USE_OPENAL= al alut
USE_GNOME= gnomehack
USE_BZIP2= YES
-CPPFLAGS= -DBR_NO_MACROS
+CPPFLAGS+= -DBR_NO_MACROS
MAKE_JOBS_SAFE= yes
post-patch:
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index bfdc8f45b5eb..12978c98adee 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -26,8 +26,8 @@ USE_SDL= image mixer sdl ttf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-cxxlua \
--with-libintl-prefix="${LOCALBASE}"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 9a7dfff43934..d2bfdb877ca3 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -21,8 +21,8 @@ USE_SDL= sdl mixer
USE_XORG= x11
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
MAN1= expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 94f641c24ab6..838c8a384c49 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -20,7 +20,8 @@ USE_SDL= sdl mixer image ttf
USE_LUA= 5.1
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LUA_INCDIR}" LDFLAGS="-L${LUA_LIBDIR}"
+CPPFLAGS+= -I${LUA_INCDIR}
+LDFLAGS+= -L${LUA_LIBDIR}
CONFIGURE_ARGS= --datadir="${DATADIR}" --with-lua="${LOCALBASE}"
MAKE_JOBS_SAFE= yes
PORTDOCS= *
diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index ab35714e3390..18302998b2a2 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -21,8 +21,8 @@ USE_SDL= sdl image mixer
USE_GL= gl
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= README
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 1470918cd513..5f05df27bc38 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -25,7 +25,6 @@ USE_XORG= x11 xproto
WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index 05eddfe5f616..11d6fb90c941 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -36,12 +36,11 @@ GNU_CONFIGURE= yes
USE_XORG= ice sm x11 xext xi xt xmu
USE_GL= gl glu glut
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-DSG_GLUT_H='<GL/glut.h>' \
-DSG_GL_H='<GL/gl.h>' \
-DSTL_STRING='<string>'
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-fgbase="${LOCALBASE}/share/flightgear"
post-patch:
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 3ce008806fb7..f40db8e3352e 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -41,7 +41,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --datadir=${LOCALBASE}/share
MAKE_JOBS_UNSAFE=yes
diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile
index 4747666b5fae..90c93240e2b6 100644
--- a/games/flyhard/Makefile
+++ b/games/flyhard/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
PORTDOCS= README
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 282cae2c91a4..9f11148e79d7 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -28,9 +28,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_XORG= xaw ice
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DESKTOP_ENTRIES= "Foobillard" \
"A free OpenGL-billard game" \
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 53a32601d2c9..bf22a8115c5e 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -20,8 +20,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${PREFIX} --program-transform-name=
INSTALLS_ICONS= yes
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 69d296246821..33e97298d0d0 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
WANT_SDL= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
MAN6= freesci-tools.6 freesci.6
diff --git a/games/garith/Makefile b/games/garith/Makefile
index 295138dee905..7aa3643736f3 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -18,7 +18,7 @@ COMMENT= Arithmetic quiz program for X Window System
USE_GNOME= gtk12
WRKSRC= ${WRKDIR}/garith
CFLAGS+= `${GTK_CONFIG} --cflags`
-LDFLAGS= `${GTK_CONFIG} --libs`
+LDFLAGS+= `${GTK_CONFIG} --libs`
PORTDOCS= BUGS HISTORY README TODO
PLIST_FILES= bin/garith
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 0e81016b91ef..df052a007c4c 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -24,8 +24,8 @@ USE_GNOME= desktopfileutils gnomehack gtksharp20 gnomesharp20
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= gbrainy.6
INSTALLS_ICONS= yes
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 7cfefe546f66..5ac709a3cec1 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -40,9 +40,9 @@ USE_DISPLAY= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20 pygtk2 libxml2 librsvg2
CONFIGURE_ARGS= --enable-gnet \
--enable-dbus
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="${PTHREAD_LIBS} -lm"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -lm"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= gcompris.6
INFO= gcompris
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index db0358b3b7da..911ab9a58a92 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug --with-libggz-dir="${LOCALBASE}"
USE_LDCONFIG= yes
USE_GGZ= core
@@ -29,8 +28,8 @@ MAN5= ggz.modules.5
MAN6= ggz.6 ggz-config.6 ggz-wrapper.6
MAN7= ggz.7
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index eb8f96c3f706..a25c3ee545c7 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -17,14 +17,13 @@ COMMENT= The GGZ Gaming Zone - GTK+ Frontend
USE_AUTOTOOLS= libtool
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
MAN6= ggz-gtk.6
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile
index 57863c75ac68..688cb521d2ca 100644
--- a/games/ggz-gtk-games/Makefile
+++ b/games/ggz-gtk-games/Makefile
@@ -18,12 +18,11 @@ RUN_DEPENDS= ${LOCALBASE}/bin/ggz-gtk:${PORTSDIR}/games/ggz-gtk-client
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile
index 8a8e241cc1ab..3d8b4abf77c3 100644
--- a/games/ggz-sdl-games/Makefile
+++ b/games/ggz-sdl-games/Makefile
@@ -17,12 +17,11 @@ COMMENT= The GGZ Gaming Zone - SDL-based games
USE_GL= gl
USE_SDL= image mixer sdl ttf
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-install:
${INSTALL_DATA} ${WRKSRC}/geekgame/module.dsc ${PREFIX}/share/ggz/geekgame.dsc
diff --git a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile
index 9331a5c833ee..1b2320231ef4 100644
--- a/games/ggz-txt-client/Makefile
+++ b/games/ggz-txt-client/Makefile
@@ -15,14 +15,13 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= The GGZ Gaming Zone - Console (Text) Frontend
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
MAN6= ggz-txt.6
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index 7c1f5e14527e..ce06650928d6 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -20,8 +20,8 @@ USE_GL= glut
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl-dir=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
DESKTOP_ENTRIES= "GL-117" \
"Action flight simulator" \
diff --git a/games/glest/Makefile b/games/glest/Makefile
index ab8f183535e0..083f0ddcb3bb 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -30,8 +30,8 @@ USE_SDL= yes
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= mk/linux/configure
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
SUB_FILES= glest-wrapper pkg-message
JAM_CMD= ${LOCALBASE}/bin/jam -qa
diff --git a/games/glife/Makefile b/games/glife/Makefile
index a5b46545c5a8..7372a7698b3f 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -17,7 +17,8 @@ COMMENT= Conway's Game of Life for GNOME
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack libglade
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index c0dfedfe0ca4..c4a009f71336 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -21,11 +21,10 @@ USE_GL= gl
USE_SDL= sdl sound
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-warn
-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= SDL_NET "With network support" off
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index c3bf187cb32f..1e0fc88f31d2 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= autoheader automake aclocal autoconf
ACLOCAL_ARGS= -I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a -c -f
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_OMF= yes
run-autotools:: run-autotools-aclocal run-autotools-autoheader \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index aaf749c81a00..25341e53f7c8 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -34,8 +34,8 @@ USE_GSTREAMER= vorbis ogg
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-sound=gstreamer \
--disable-tests
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= aisleriot.schemas glchess.schemas glines.schemas \
gnect.schemas gnibbles.schemas gnobots2.schemas \
diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile
index 9f92987d1dae..187c2a8776d8 100644
--- a/games/gnomeattacks/Makefile
+++ b/games/gnomeattacks/Makefile
@@ -17,7 +17,7 @@ COMMENT= GNOME 2 game featuring a bizarre flying GNOME logo
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomevfs2 libgnomeui
-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/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index f939f668d716..2efb84cd5b08 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -17,8 +17,8 @@ COMMENT= GNOME version of the classic breakout game
USE_GNOME= gnomehack gnomeprefix libgnomeui
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 \
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index e6d0d37cf37f..5dd09be34e51 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gnomecanvas gnomehack gnomeprefix libglade
USE_GMAKE= 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
MAKE_ARGS= XML_I18N_UPDATE="${TRUE}" XML_I18N_EXTRACT="${TRUE}"
.include <bsd.port.mk>
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index f6d66be775c3..7747603a729f 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
USE_GNOME= gnomeprefix gnomehack libgnomeui
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gnomekiss.1
.include <bsd.port.mk>
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 9c804e12b37b..9ec8455e9009 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -19,8 +19,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
USE_AUTOTOOLS= libtool
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/games/gnomermind/Makefile b/games/gnomermind/Makefile
index ff9f9991ee0c..7ba3702213f4 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -17,8 +17,8 @@ COMMENT= A puzzle game for Gnome, loosely based on the classic MasterMind game
USE_BZIP2= yes
USE_GNOME= gdkpixbuf gnomehack gnomelibs gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= OLD_PO_FILE_INPUT=1
post-patch:
diff --git a/games/gnono/Makefile b/games/gnono/Makefile
index 59539d888784..800f3abe8c5a 100644
--- a/games/gnono/Makefile
+++ b/games/gnono/Makefile
@@ -20,9 +20,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= ${PORTNAME}.6
post-patch:
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 951cc1175999..fc446fbbe2d8 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -32,8 +32,7 @@ OPTIONS= ESOUND "Enable sound support" ON \
CONFIGURE_ARGS= --with-board3d
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
+CONFIGURE_ENV= ac_cv_path_ARTSC_CONFIG=no ac_cv_path_LIBART_CONFIG=no
USE_GNOME= gnomehack libxml2
USE_GMAKE= yes
@@ -66,8 +65,8 @@ CONFIGURE_ARGS+= --disable-sse
MAN6= gnubg.6
INFO= gnubg
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
${GUNZIP_CMD} --stdout ${DISTDIR}/${DIST_SUBDIR}/gnubg_ts0.bd.gz > ${WRKSRC}/gnubg_ts0.bd
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index b7f15eadb739..0f6c84a70ec1 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile
USE_GNOME= vte
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 583477ebfafa..66c54ad32725 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
USE_GL= glut
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= autoconf213
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
- -I${LOCALBASE}/include/tcl8.4 \
- -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/tcl8.4
USE_GMAKE= yes
# for plib (sound):
CONFIGURE_ARGS+= --with-plib=${LOCALBASE}/plib
diff --git a/games/greed/Makefile b/games/greed/Makefile
index cf5e3e09f61d..7f688282329c 100644
--- a/games/greed/Makefile
+++ b/games/greed/Makefile
@@ -18,7 +18,7 @@ MAN6= greed.6
PLIST_FILES= bin/greed
SCOREFILE?= /var/games/greed.hs
CFLAGS+= -DSCOREFILE=\"${SCOREFILE}\" -DNOTBSD -DRELEASE=\"${PORTVERSION}\"
-LDFLAGS= -lcurses
+LDFLAGS+= -lcurses
do-build:
@cd ${WRKSRC}&&${CC} ${CFLAGS} -o greed greed.c ${LDFLAGS}
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index dd08b59bb57c..c861773e0649 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -17,8 +17,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomeprefix libgnomeui
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_OMF= yes
PLIST_SUB+= VERSION=${PORTVERSION}
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 708be970eb70..6cb47ab2a964 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -19,8 +19,8 @@ USE_BZIP2= yes
USE_GNOME= esound gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --enable-ipv6
MAN6= gtetrinet.6
diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile
index 8ad4e3ac714b..b6b163013694 100644
--- a/games/gtkabale/Makefile
+++ b/games/gtkabale/Makefile
@@ -19,8 +19,8 @@ EXPIRATION_DATE= 2011-09-01
USE_GNOME= imlib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index f7e34dccf36d..dc5c64874af5 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -17,8 +17,8 @@ USE_BZIP2= yes
USE_GNOME= 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
post-patch:
@${REINPLACE_CMD} -e '/-Werror/s|^|#|' ${WRKSRC}/configure
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 4669b4610bef..33d1e1760721 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -18,8 +18,8 @@ USE_GETTEXT= yes
USE_GNOME= 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
CONFIGURE_ARGS= --localstatedir=${DATADIR}
MAN6= gtkballs.6x
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index deedbabf828b..d3d0a3808dae 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -21,11 +21,10 @@ LICENSE_COMB= dual
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index e89cf4cd8acf..8c893e898c37 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -18,8 +18,8 @@ USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
INSTALLS_OMF= yes
PORTDOCS= AUTHORS COPYING NEWS ChangeLog TODO README INSTALL
diff --git a/games/hangman/Makefile b/games/hangman/Makefile
index 644a2bdbd52b..477aabc14c90 100644
--- a/games/hangman/Makefile
+++ b/games/hangman/Makefile
@@ -19,9 +19,9 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer image ttf
-CONFIGURE_ENV= LDFLAGS="`${SDL_CONFIG} --libs`" \
- CPPFLAGS="`${SDL_CONFIG} --cflags`" \
- SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= `${SDL_CONFIG} --libs`
MAN6= hangman.6
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 9653339a2ad2..a74d5666414f 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -39,8 +39,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
MAKE_JOBS_SAFE= yes
@@ -53,8 +52,8 @@ CONFIGURE_ARGS+=--disable-optimizations
MAN6= heroes.6 heroeslvl.6
INFO= heroes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -lsmpeg ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -lsmpeg ${PTHREAD_LIBS}
pre-everything::
.ifndef(WITH_OPTIMIZED_CFLAGS)
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 738b40aabcb1..9c32c4693c48 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -15,7 +15,6 @@ COMMENT= A puzzle game based on hexagonal tiles
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -I${LOCALBASE}/include
diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile
index 4e09c2ac836a..28a1489b89fc 100644
--- a/games/highmoon/Makefile
+++ b/games/highmoon/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
CXXFLAGS+= `${SDL_CONFIG} --cflags`
-LDFLAGS= `${SDL_CONFIG} --libs` -lSDL_image
+LDFLAGS+= `${SDL_CONFIG} --libs` -lSDL_image
post-patch:
@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index 24b1e131013b..6e8a01013922 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -25,11 +25,10 @@ USE_LDCONFIG= yes
USE_GETTEXT= yes
INSTALLS_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ${PORTNAME}.1
diff --git a/games/koth/Makefile b/games/koth/Makefile
index acb19c31d419..788319134804 100644
--- a/games/koth/Makefile
+++ b/games/koth/Makefile
@@ -24,7 +24,8 @@ PLIST_FILES= bin/kclever-ai bin/kmoron-ai bin/koth bin/koths
MAN6= kclever-ai.6 kmoron-ai.6 koth.6 koths.6
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGG_NEED_OLD_INTTYPES" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DGG_NEED_OLD_INTTYPES
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-lggi|-lggi ${PTHREAD_LIBS}|' ${WRKSRC}/configure
diff --git a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index 43c127e373ff..e1b402246b1e 100644
--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@@ -21,10 +21,9 @@ OPTIONS= VORBIS "Enable Ogg/Vorbis support" on
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include ${PTHEAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHEAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/games/lander/Makefile b/games/lander/Makefile
index d97c57c9e07f..9f5ea0765736 100644
--- a/games/lander/Makefile
+++ b/games/lander/Makefile
@@ -24,8 +24,8 @@ USE_GL= gl glu
MAKE_JOBS_SAFE= yes
USE_GCC= 4.2+
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-boost="${LOCALBASE}" \
--with-boost-filesystem=boost_filesystem
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 3957082b89e2..421fba024ee6 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_SDL= mixer net sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-sdl-net \
--localstatedir=/var/games \
--disable-nls
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/lexter/Makefile b/games/lexter/Makefile
index 22d4d807205c..fa12242e4971 100644
--- a/games/lexter/Makefile
+++ b/games/lexter/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A real-time word puzzle for text terminals
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib'
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --localstatedir=/var/games
USE_GETTEXT= yes
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index 0b7afc585e01..c8781827930c 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -23,14 +23,13 @@ CONFLICTS= lgeneral-data-[0-9]*
USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
MAN1= lgc-pg.1
MAN6= lgeneral.6
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_SOUND)
CONFIGURE_ARGS+=--disable-sound
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 0088275d54f9..d6ea73b7ef8d 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gtk20 esound
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(NOPORTDOCS)
INSTALL_TARGET= install install-llk_linuxdocDATA
diff --git a/games/libggz/Makefile b/games/libggz/Makefile
index 032e83b6663e..404582125688 100644
--- a/games/libggz/Makefile
+++ b/games/libggz/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
USE_LDCONFIG= yes
MAN3= ggz.h.3
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITH_GNUTLS)
LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 017ed3bc233c..d9cfa299e7b5 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libphysfs=${PREFIX} \
--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's| -O| -I${LOCALBASE}/include&|g' \
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 477abf324ac5..bd628de2237b 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -22,8 +22,8 @@ USE_CSTD= c89
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= lincity.6
diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index 5c4de574601b..d793ffc80cce 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -44,8 +44,8 @@ USE_SDL+= mixer
CONFIGURE_ARGS+=--disable-sound
.endif
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index 4bdbb15e2c95..9b209c6deb17 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -16,7 +16,8 @@ COMMENT= Classical memory game
GNU_CONFIGURE= yes
USE_SDL= sdl
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
PLIST_SUB+= NLS=""
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 9a9933ec927f..6c0884c2c78a 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -17,8 +17,8 @@ COMMENT= An another tetris clone but a good one with bunch of cool features
USE_SDL= mixer sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=${DATADIR}
.include <bsd.port.pre.mk>
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index a511e62e3a9b..7a4120e50177 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -37,12 +37,11 @@ WANT_GNOME= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= macopix.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_GNUTLS)
LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile
index c340910128b2..f92b080c7664 100644
--- a/games/madbomber/Makefile
+++ b/games/madbomber/Makefile
@@ -16,8 +16,8 @@ COMMENT= A clone of Activision's classic Atari 2600 console game "Kaboom!"
USE_SDL= mixer image sdl
-CPPFLAGS= `${SDL_CONFIG} --cflags` -DDATA_PREFIX=\"${DATADIR}/\"
-LDFLAGS= `${SDL_CONFIG} --libs`
+CPPFLAGS+= `${SDL_CONFIG} --cflags` -DDATA_PREFIX=\"${DATADIR}/\"
+LDFLAGS+= `${SDL_CONFIG} --libs`
do-build:
cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} \
diff --git a/games/mangos/Makefile b/games/mangos/Makefile
index cde14340f375..67adfcdb44b0 100644
--- a/games/mangos/Makefile
+++ b/games/mangos/Makefile
@@ -32,7 +32,6 @@ USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/games/maxr/Makefile b/games/maxr/Makefile
index 77428c1e2323..18e2bd6eba2c 100644
--- a/games/maxr/Makefile
+++ b/games/maxr/Makefile
@@ -18,7 +18,8 @@ COMMENT= Mechanized Assault and Exploration Reloaded
GNU_CONFIGURE= yes
USE_SDL= sdl mixer net
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
DESKTOP_ENTRIES="M.A.X.R." \
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 60033a3eb865..330cb11a4540 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gnomedocutils gnomehack gnomeprefix intlhack \
USE_GSTREAMER= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_OMF= yes
GCONF_SCHEMAS= monkey-bubble.schemas
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index b6ec57736385..3f8b626293bc 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -23,8 +23,8 @@ USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnome esound
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lesd"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lesd
GCONF_SCHEMAS= monster-masher.schemas
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index f6b000b66644..d9c79a28c7bd 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PYTHON= 24
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= mudmagic.1
diff --git a/games/naev/Makefile b/games/naev/Makefile
index aef3c856a1bd..441c6873fa9d 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -28,7 +28,8 @@ USE_GNOME= libxml2
USE_SDL= sdl image
CONFIGURE_ARGS= --with-ndata-path=${DATADIR}/ndata-${PORTVERSION}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN6= naev.6
PLIST_FILES= bin/${PORTNAME}
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 6bcb10c25c1e..e964ef26f9a1 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
LATEST_LINK= nethack33${PKGNAMESUFFIX}
USE_GMAKE= yes
-MAKE_ENV= GRAPHICS="${GRAPHICS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= GRAPHICS="${GRAPHICS}"
PLIST_SUB= HACKNAME="${HACKNAME}" \
HACKEXT="${HACKEXT}"
MAKE_JOBS_UNSAFE= yes
@@ -44,7 +44,6 @@ GRAPHICS= X11_GRAPHICS
.if ${PKGNAMESUFFIX} == "-gnome"
CATEGORIES= games gnome
USE_GNOME= gnomelibs
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GRAPHICS= GNOME_GRAPHICS
.elif ${PKGNAMESUFFIX} == "-nox11"
GRAPHICS= # none
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index aa76af09bfd4..c5cda41b64c3 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -40,7 +40,6 @@ GRAPHICS= X11_GRAPHICS
MAKE_JOBS_UNSAFE= yes
CATEGORIES= games gnome
USE_GNOME= gnomelibs
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GRAPHICS= GNOME_GRAPHICS
.elif ${PKGNAMESUFFIX} == "-nox11"
GRAPHICS= # none
diff --git a/games/netpanzer-data/Makefile b/games/netpanzer-data/Makefile
index 417e59cf64ba..b4dc5d2a55bb 100644
--- a/games/netpanzer-data/Makefile
+++ b/games/netpanzer-data/Makefile
@@ -23,8 +23,8 @@ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-libphysfs=${LOCALBASE} \
--datadir=${PREFIX}/share
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_BZIP2= yes
USE_SDL= sdl net mixer image
diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index aced84e1d600..4ebd82fe208d 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpan
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-libphysfs=${LOCALBASE} --without-wx-config
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_BZIP2= yes
USE_SDL= sdl net mixer image ttf
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index 02a2dce8abae..8cc0fcf6f002 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -20,8 +20,8 @@ MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk12
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -ltermcap"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -ltermcap
MAN6= gspades.6 slspades.6 spadesd.6
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index e3ceb48f8c60..477bb7425bb6 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -28,7 +28,7 @@ MAN6= nighthawk.6
CFLAGS+= -DINSTALL_DIR=\\\"\${DATADIR}\\\" \
-DSCORES_FILE=\\\"/var/games/nighthawk.scores\\\" \
-I${LOCALBASE}/include
-LDFLAGS= -lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut
+LDFLAGS+= -lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut
post-patch:
${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile
index 61611b0d3c19..e44dbd2fbc92 100644
--- a/games/nimuh/Makefile
+++ b/games/nimuh/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_SDL= sdl image mixer
USE_GL= gl
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DATA_WRKSRC= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
diff --git a/games/njam/Makefile b/games/njam/Makefile
index ab6bda58f5bb..3412a8a81aff 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -17,7 +17,7 @@ COMMENT= Fast paced multiplayer pac-man clone
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D__linux__"
+CPPFLAGS+= -I${LOCALBASE}/include -D__linux__
USE_SDL= mixer image net sdl
MAKE_JOBS_SAFE= yes
PORTDOCS= *
diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index 3f6dfbe3b34d..705099a974a6 100644
--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@@ -21,8 +21,9 @@ GNU_CONFIGURE= yes
USE_SDL= sdl image
INSTALLS_ICONS= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -DINSTALL_BASE_PATH=\"\\\"${DATADIR}\\\"\""
+CONFIGURE_ENV= AUTOMAKE="${TRUE}" ACLOCAL="${TRUE}" MISSING="${TRUE}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include -DINSTALL_BASE_PATH=\"\\\"${DATADIR}\\\"\"
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 01047d75eb29..76e06822f875 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -26,8 +26,6 @@ ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
USE_GNOME= pkgconfig pygtk2
USE_XORG= xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
USE_GL= gl glu
diff --git a/games/openglad/Makefile b/games/openglad/Makefile
index 02a7337dc631..d890e1f058d4 100644
--- a/games/openglad/Makefile
+++ b/games/openglad/Makefile
@@ -18,7 +18,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_SDL= sdl mixer
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
NOT_FOR_ARCHS= sparc64
diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile
index 77c6484c79ea..bb151b421fbe 100644
--- a/games/openjazz/Makefile
+++ b/games/openjazz/Makefile
@@ -31,7 +31,6 @@ DOS2UNIX_REGEX= .*\.(h|cpp)
CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \
-DDATAPATH=\\\"${DATADIR}/\\\" -DHOMEDIR
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
SUB_FILES= pkg-message
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index f7e11cbfda1f..96a5f2bcc0e0 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -21,7 +21,7 @@ USE_PERL5= yes
USE_SDL= mixer image sdl net
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/games/opensonic/Makefile b/games/opensonic/Makefile
index bd46422af74c..3aeec8e55dac 100644
--- a/games/opensonic/Makefile
+++ b/games/opensonic/Makefile
@@ -26,7 +26,6 @@ USE_CMAKE= yes
CMAKE_ENV+= OPENSNC_ALLEGRO_LIBS="`allegro-config --libs`" OPENSNC_ALLEGRO_VERSION="`allegro-config --version`"
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= CFLAGS="${CFLAGS}"
BUILD_DEPENDS+= ${LOCALBASE}/lib/libaldmb.a:${PORTSDIR}/audio/dumb-allegro \
alpng>=1.3:${PORTSDIR}/graphics/alpng
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index e0e7ae6612f4..1a4d90c861a8 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -18,9 +18,8 @@ USE_BZIP2= yes
USE_WX= 2.8+
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index 35acadb38bd2..7c03ea3fb921 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/games/orbital_eunuchs_sniper/Makefile
@@ -17,14 +17,13 @@ COMMENT= An overhead shooting game
USE_SDL= sdl image mixer
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-games-dir=${PREFIX}/share
MAKE_JOBS_SAFE= yes
PORTDOCS= AUTHORS ChangeLog README TODO readme.txt
-CPPFLAGS= `${SDL_CONFIG} --cflags`
-LDFLAGS= `${SDL_CONFIG} --libs`
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= `${SDL_CONFIG} --libs`
post-install:
.if !defined(NOPORTDOCS)
diff --git a/games/pachi/Makefile b/games/pachi/Makefile
index daf239a97ea7..de72e9841620 100644
--- a/games/pachi/Makefile
+++ b/games/pachi/Makefile
@@ -24,8 +24,6 @@ MAKE_JOBS_SAFE= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-
WRKSRC= ${WRKDIR}/Pachi
SCOREDIR= /var/games/pachi
diff --git a/games/pengupop/Makefile b/games/pengupop/Makefile
index ed3d97d203f9..6f1161fe79f5 100644
--- a/games/pengupop/Makefile
+++ b/games/pengupop/Makefile
@@ -17,8 +17,8 @@ COMMENT= Online multiplayer clone of Bust a Move
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PLIST_FILES= bin/pengupop
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 02e79bb83365..cb5ad15c8380 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug
CONFIGURE_ARGS+= --with-allegro
EXTRA_LIBS= -lGL -lGLU
.endif
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -DRZR_LIBSTATIC" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -DRZR_LIBSTATIC
+LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS}
MAKE_JOBS_UNSAFE= yes
ALLEGRO_CONFIG= ${LOCALBASE}/bin/allegro-config
diff --git a/games/pinedit/Makefile b/games/pinedit/Makefile
index 08d10bf03fed..11337c6a47ec 100644
--- a/games/pinedit/Makefile
+++ b/games/pinedit/Makefile
@@ -23,7 +23,7 @@ USE_PERL5_BUILD= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/pinball"
-CPPFLAGS= -DRZR_LIBSTATIC
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/pinball
+CPPFLAGS+= -DRZR_LIBSTATIC
.include <bsd.port.mk>
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 2e0769bb65b5..cf9f530a985f 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -21,8 +21,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix gtk20 libgnome
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN6= pioneers.6 pioneers-server-gtk.6 pioneers-server-console.6 \
pioneersai.6 pioneers-meta-server.6 pioneers-editor.6
diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile
index 9c6b215eba4b..0fcffcbc0d31 100644
--- a/games/pipenightdreams/Makefile
+++ b/games/pipenightdreams/Makefile
@@ -18,7 +18,7 @@ USE_SDL= image sdl
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN6= pipenightdreams.6
diff --git a/games/pipewalker/Makefile b/games/pipewalker/Makefile
index f7f13bd505e0..92aa4d89cc69 100644
--- a/games/pipewalker/Makefile
+++ b/games/pipewalker/Makefile
@@ -19,8 +19,8 @@ USE_SDL= sdl
USE_GL= gl glu
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PORTDOCS= *
diff --git a/games/pongix/Makefile b/games/pongix/Makefile
index 972de822de26..7f4c2461e394 100644
--- a/games/pongix/Makefile
+++ b/games/pongix/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
do-install:
${MKDIR} ${DATADIR}
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 4ff47c0d4fa5..13a72a6b3808 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_SDL= mixer net sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= GL "Enable OpenGL support" on
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index 7af4c6bccb05..614915234dae 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer ttf
USE_LUA= 5.1
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/qonk/Makefile b/games/qonk/Makefile
index 5a64b5e8154d..58b7a530438f 100644
--- a/games/qonk/Makefile
+++ b/games/qonk/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl gfx ttf image
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs` |' \
diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index ba382dfe9444..7616228192d5 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -22,10 +22,10 @@ USE_GL= glut
USE_DOS2UNIX= src/vanctf/g_local.h
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- OPENGL_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= OPENGL_CFLAGS="-I${LOCALBASE}/include" \
OPENGL_LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LIBDIR= ${PREFIX}/lib/${PORTNAME}
PLIST_SUB+= LIBDIR="${LIBDIR:S/${PREFIX}\///}"
diff --git a/games/race/Makefile b/games/race/Makefile
index 831333b4d043..327c50a06f07 100644
--- a/games/race/Makefile
+++ b/games/race/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GL= glut
CFLAGS+= "-I${LOCALBASE}/include"
CC+= ${CFLAGS}
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e "s|^CC|#CC|g" \
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index cdcfd97f4a6a..9e523b5d1c52 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
USE_SDL= sdl mixer
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include"
+CPPFLAGS+= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
DESKTOP_ENTRIES="Ri-li" \
"Drive a toy wood train in many levels - snake-like arcade game" \
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index e66616b3e796..859e4e5ea0ce 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -23,11 +23,10 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-rtb-dir=${PREFIX}/lib/${PORTNAME}
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
.for file in configure
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 511e0d11b6a3..d0c45aee3332 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -46,7 +46,6 @@ CONFIGURE_ARGS= --program-prefix='' \
.if defined(WITH_MYSQL)
CONFIGURE_ARGS+= --with-mysql
.endif
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index 600210ad32f8..0c0e56551251 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-data-dir=${DATADIR}
diff --git a/games/scramble/Makefile b/games/scramble/Makefile
index 9004437b79ae..747945d473ac 100644
--- a/games/scramble/Makefile
+++ b/games/scramble/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer image ttf
-CONFIGURE_ENV= LDFLAGS="`${SDL_CONFIG} --libs`" \
- CPPFLAGS="`${SDL_CONFIG} --cflags`" \
- SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= `${SDL_CONFIG} --libs`
MAN6= scramble.6
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 638b41e85afe..5c5968567ade 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
MAKE_JOBS_SAFE= yes
-MAKE_ENV= "LDFLAGS= -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CXXFLAGS= -I${LOCALBASE}/include
OPTIONS= WX "Build wxWidgets GUI" On
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 4c1fde739a93..0b97edbdb397 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -28,8 +28,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--disable-debug \
--disable-nasm \
--disable-tremor
-CONFIGURE_ENV= CXX="${CXX}"
- LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
OPTIONS= VORBIS "Enable Ogg Vorbis support" on \
MP3 "Enable MP3 support" on \
diff --git a/games/sdb/Makefile b/games/sdb/Makefile
index 8e5bab937ca8..4178b569443d 100644
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
BUILD_WRKSRC= ${WRKSRC}/src
CXXFLAGS+= `${SDL_CONFIG} --cflags`
-LDFLAGS= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
+LDFLAGS+= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}"
PORTDOCS= *
diff --git a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile
index 6fea4b627243..76057e63ffac 100644
--- a/games/secretmaryochronicles/Makefile
+++ b/games/secretmaryochronicles/Makefile
@@ -29,8 +29,8 @@ USE_GL= gl glu
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DATADIR= ${PREFIX}/share/smc
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index d7e51397f1d1..fa0ac47c5cf5 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -21,8 +21,8 @@ USE_BZIP2= yes
USE_SDL= mixer image sdl
USE_GL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-optimize
DATADIR= ${PREFIX}/share/Shaaft
diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile
index 92e798a916ac..588667190450 100644
--- a/games/shootingstar/Makefile
+++ b/games/shootingstar/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_GL= gl
USE_SDL= sdl mixer image
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/games/sjeng/Makefile b/games/sjeng/Makefile
index 651fc62b5325..2ef8464f340c 100644
--- a/games/sjeng/Makefile
+++ b/games/sjeng/Makefile
@@ -18,8 +18,8 @@ COMMENT= Chess engine supporting chess variations
LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgdbm"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lgdbm
PLIST_FILES= bin/sjeng
diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile
index fd5e2e5a530a..a8e9f428a320 100644
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@@ -20,8 +20,9 @@ AUTOMAKE_ARGS= -i --add-missing
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= spacejunk
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index 921c0ac34293..2af0ff260507 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -30,8 +30,8 @@ USE_GL= gl glu
USE_XORG= x11 xtst xrandr xau xdmcp xext xrender
USE_ICONV= yes
USE_GNOME= gtk20
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
- CFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
# Not yet implemented
# FFMPEG "Enable ffmpeg support" off \
diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile
index 34b531d97702..cda28335293c 100644
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
MAKEFILE= makefile
BUILD_WRKSRC= ${WRKSRC}/source/linux
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/ClanLib-0.8
-LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/ClanLib-0.8
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ClanLib-0.8
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/ClanLib-0.8
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 403ef2b9af56..703e532998a2 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -33,8 +33,8 @@ PORTDOCS= *
# Using LIBS instead of LDFLAGS, otherwise will break when
# there's devel/bullet port installed
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-irrlicht="${LOCALBASE}"
LICENSE= GPLv3
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index 62fcfa28370a..64dac6c21913 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -21,7 +21,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/games/teg/Makefile b/games/teg/Makefile
index b4b6dccfa32c..8ad932e57207 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -17,8 +17,8 @@ COMMENT= A turn-based strategy game for GNOME
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
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-ggz
GCONF_SCHEMAS= teg.schemas
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index 5667c2d68aa3..4d3b8c34767e 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -19,8 +19,8 @@ HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_SDL= sdl
USE_PERL5_BUILD=yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
PLIST_FILES= bin/valley
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index abb31b17aecf..a38dae6dcafe 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -21,13 +21,12 @@ WRKSRC= ${WRKDIR}/mux2.6/src
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
PORTDOCS= *
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PATCHLEVEL= 32
diff --git a/games/tmw/Makefile b/games/tmw/Makefile
index 3841a6396dab..83c5a47a41c5 100644
--- a/games/tmw/Makefile
+++ b/games/tmw/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= guichan>=0.8.1:${PORTSDIR}/devel/guichan
GNU_CONFIGURE= yes
USE_SDL= sdl image mixer net ttf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ${PTHREAD_CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ${PTHREAD_CFLAGS}
MAN6= tmw.6
OPTIONS= MUSIC "Install additional music" on \
@@ -35,11 +35,11 @@ OPTIONS= MUSIC "Install additional music" on \
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.endif
.if !defined(WITHOUT_MUSIC)
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index 543ad21720a4..5e4c7846bcc1 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -17,13 +17,12 @@ USE_SDL= mixer sdl
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share
MAN6= ${PORTNAME}.6
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index faff71d2cd10..e159cf3a895b 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
REINPLACE_ARGS= -i ""
CONFIGURE_ARGS= --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include -DHAVE_DECL_GETOPT" \
- LIBS="${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
ALL_TARGET= default
INSTALL_TARGET= install datainstall
diff --git a/games/torrent/Makefile b/games/torrent/Makefile
index a24c273868e0..dffde6933bb5 100644
--- a/games/torrent/Makefile
+++ b/games/torrent/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer image ttf
-CONFIGURE_ENV= LDFLAGS="`${SDL_CONFIG} --libs`" \
- CPPFLAGS="`${SDL_CONFIG} --cflags`" \
- SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= `${SDL_CONFIG} --libs`
MAN6= torrent.6
diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index 6c9f67e9d743..e25a66a69713 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= 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
PORTDOCS= README
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 93b26f63b4ad..3b2eccd52db6 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -26,14 +26,13 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= desktopfileutils
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= mkinstalldirs="${MKDIR}"
MAN6= trackballs.6
MANCOMPRESSED= no
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lintl
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
post-patch:
@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index 4caec5f1f621..4cc32ef3bba7 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -24,8 +24,8 @@ USE_SDL= sdl image
USE_GL= yes
USE_BZIP2= yes
GNU_CONFIGURE= 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}
WRKSRC= ${WRKDIR}/trigger-${PORTVERSION}-src
DATASRC= ${WRKDIR}/trigger-${DATAVERSION}-data
diff --git a/games/trophy/Makefile b/games/trophy/Makefile
index 756fb15ec349..f61b7be2b7cf 100644
--- a/games/trophy/Makefile
+++ b/games/trophy/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib
HAS_CONFIGURE= yes
PORTDOCS= AUTHORS COPYING ChangeLog README TODO
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --prefix="${PREFIX}" --exec-prefix="${PREFIX}"
DESKTOP_ENTRIES="Trophy" "${COMMENT}" "" "trophy" "Application;Game;" false
diff --git a/games/ttt/Makefile b/games/ttt/Makefile
index 2fae0d59e21c..41a1bdbe4e6b 100644
--- a/games/ttt/Makefile
+++ b/games/ttt/Makefile
@@ -24,11 +24,10 @@ USE_SDL= sdl
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal automake autoheader autoconf
AUTOMAKE_ARGS= --add-missing --force
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index b84788a8bef3..8f8fcc549250 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -22,12 +22,11 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
USE_GL= glut
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-plib=${LOCALBASE}
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -lusbhid ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -lusbhid ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 7d79b3af9b3a..61ec68393cf8 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
USE_GL= gl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lusbhid"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lusbhid"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-plib=${LOCALBASE}
.include <bsd.port.pre.mk>
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 0e65cde3ccdd..257fc7d8d74a 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -19,8 +19,9 @@ USE_GMAKE= yes
USE_SDL= image mixer sdl ttf pango
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=""
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="-pthread"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${DISTNAME:S/.17/.16/}
post-patch:
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index d89c133f40a2..d4efa1643189 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -34,9 +34,9 @@ USE_GNOME= pkgconfig
USE_OPENAL= soft
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-release=yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+= -I${LOCALBASE}/include
DATADIR= share/${PORTNAME}
SUB_FILES= pkg-message
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index acb8d79f8f3b..cc8014191de7 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -23,11 +23,10 @@ USE_SDL= sdl image
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-openal
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_UNSAFE= yes
-CPPFLAGS= `${SDL_CONFIG} --cflags`
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= `${SDL_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib
PORT_VERBS= ${PORTNAME} ustunts
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 59bf4341b2c9..2307ecf8f866 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -20,15 +20,14 @@ USE_GL= glut
USE_SDL= sdl
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= ac_cv_header_boost_test_unit_test_hpp=no \
ac_cv_lib_freeglut_glutGetModifiers=no
USE_LDCONFIG= yes
INFO= vamos
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index 00a86f49eda7..6ccdfa5320c0 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON= yes
USE_SDL= sdl
USE_GL= gl glu glut
USE_GNOME= gtk20
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_JOBS_SAFE= yes
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index ad5b54a6a30f..d8bf77625b16 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -21,7 +21,7 @@ USE_SDL= sdl image mixer
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" --disable-nls # strangeness in nls support
MAKE_JOBS_SAFE= yes
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index 56731e2ccc6c..bcc3276895ec 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -44,8 +44,8 @@ post-patch:
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 7298935692df..b9bf31c572a6 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -34,10 +34,10 @@ USE_GL= yes
USE_GMAKE= yes
USE_SDL= net sdl
CONFIGURE_ARGS= --program-transform-name="" --with-distributor="FreeBSD ports"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="${PTHREAD_LIBS}" \
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" \
PATH="${LOCALBASE}/bin:$$PATH"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
REINPLACE_ARGS= -i ''
MAKE_JOBS_SAFE= yes
PORTDOCS= *
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 260f00ce760e..71440f2c11be 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -31,8 +31,7 @@ USE_LUA= 5.1
USE_AUTOTOOLS= aclocal autoheader automake autoconf
ACLOCAL_ARGS= -Im4
AUTOMAKE_ARGS= --add-missing --copy
-CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
- LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}"
CONFIGURE_ARGS= --localstatedir=/var \
--with-boost=${LOCALBASE} \
--with-icondir=${PREFIX}/share/pixmaps \
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index d2fd58648cc6..2b5c80bb3741 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -19,13 +19,12 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_XORG= xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN6= wmpuzzle.6
PLIST_FILES= bin/wmpuzzle
-CPPFLAGS= -I${LOCALBASE}/include -DBSD
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DBSD
+LDFLAGS+= -L${LOCALBASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmpuzzle ${PREFIX}/bin
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 7140782ccb9a..606a9ee82904 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -15,8 +15,7 @@ COMMENT= A 3D block-dropping game
USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_prog_IMAKE="" ac_cv_prog_XMKMF=""
+CONFIGURE_ENV= ac_cv_prog_IMAKE="" ac_cv_prog_XMKMF=""
MAKE_ARGS= USE_SETGID="" \
GROUP_GID="" \
RESOURCEDIR="${PREFIX}/lib/X11/app-defaults" \
@@ -29,8 +28,8 @@ MAKE_ARGS= USE_SETGID="" \
MAN1= xbl.1
CFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|@CFLA@ -g|@CFLA@|g' ${WRKSRC}/Makefile.in
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 41647048f04a..85c6dd64feb9 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -43,7 +43,6 @@ WANT_SDL= yes
.endif
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-admin
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
@@ -53,8 +52,8 @@ MAN6= xblast.6
DATADIR= ${PREFIX}/share/XBlast-TNT
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
FONTSDIR= ${LOCALBASE}/lib/X11/fonts/bitstream-vera
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 7c10be568c34..f1d384c19261 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include/libpng
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
.include <bsd.port.mk>
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index 3a5506aa4dd4..23c2342331d9 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -20,7 +20,6 @@ USE_GNOME= gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN6= xcowsay.6
PLIST_FILES= bin/xcowdream \
@@ -34,8 +33,8 @@ PLIST_FILES= bin/xcowdream \
%%DATADIR%%/cow_small.png
PLIST_DIRS= %%DATADIR%%
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index e07c6e68f3cc..43c7050adc38 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -23,8 +23,8 @@ USE_GETTEXT= yes
USE_XORG= x11 xmu xaw xt
USE_AUTOTOOLS= automake14 autoconf213
AUTOMAKE_ARGS= --include-deps
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --enable-scorefile=${PREFIX}/share/xinvaders/xinvaders.scores
MAN6= xinvaders.6
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 34dcd61ac418..ebb4fb346809 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -31,9 +31,8 @@ USE_GL= gl glu
USE_DOS2UNIX= src/*.cpp src/*.h
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR}
-LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 5d9c7c99a689..1c9fa7356ead 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -21,10 +21,9 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --program-prefix=""
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 577b704810d0..6294d143a893 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -20,12 +20,11 @@ USE_GNOME= intlhack
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN6= xqf.6
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= GTK2 "GTK+ 2.0 support" on \
GEOIP "GeoIP support" on \
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index d460252ba6dc..4850982a95e6 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -23,9 +23,7 @@ USE_XORG= x11 xi xpm
USE_BZIP2= yes
USE_GMAKE= yes
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS}"
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- INCLUDES="-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+MAKE_ENV= INCLUDES="-I${LOCALBASE}/include"
.include <bsd.port.mk>
diff --git a/games/xsc/Makefile b/games/xsc/Makefile
index 4c269aad595e..f586483d3c5c 100644
--- a/games/xsc/Makefile
+++ b/games/xsc/Makefile
@@ -16,8 +16,6 @@ COMMENT= A vector graphics space shoot'em up game
USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/xsc
.include <bsd.port.mk>
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 5e5cf06acd1e..6df6f91721c3 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -17,8 +17,8 @@ COMMENT= A cuddlesome teddy for the X desktop
NO_CDROM= Can only be distributed for free
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= imlib
MAN6= xteddy.6
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index 3dba066ef273..07352f1b398c 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -24,8 +24,8 @@ USE_SDL= sdl image
USE_GL= gl glu
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-icondir="${PREFIX}/share/pixmaps"
PORTDOCS= *
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 67fb99e2fa4d..2f63df5e5429 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -23,8 +23,8 @@ USE_PERL5= yes
USE_XORG= xft
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/zoom %%DATADIR%%/zoomrc
PLIST_DIRS= %%DATADIR%%
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
diff --git a/irc/bip/Makefile b/irc/bip/Makefile
index dea1bec32973..583c052cf902 100644
--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@@ -15,7 +15,7 @@ COMMENT= A simple IRC proxy with SSL support
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
INSTALL_TARGET= SUBDIR=src install-exec
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index c185e1833afe..0d00cbf409ed 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
--bindir="${PREFIX}/bin" \
--datadir="${PREFIX}/share" \
--libdir="${PREFIX}/share"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS}" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= BitchX.1
diff --git a/irc/bobot++/Makefile b/irc/bobot++/Makefile
index 30002e1fb571..9bf6dcea42b3 100644
--- a/irc/bobot++/Makefile
+++ b/irc/bobot++/Makefile
@@ -20,15 +20,14 @@ LICENSE_COMB= dual
OPTIONS= GUILE "Use Guile scripts" on
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
INFO= bobot++
PORTDOCS= *
PORTEXAMPLES= *
PLIST_FILES= bin/${PORTNAME}
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index 0c72b19b81c1..0a4efd4c1e93 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -22,13 +22,12 @@ USE_GNOME= glib20
USE_LDCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ctrlproxy.1
MAN5= ctrlproxy_config.5
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${MANPREFIX}/man/man1
diff --git a/irc/dcc/Makefile b/irc/dcc/Makefile
index e6f77345d66b..51612043a319 100644
--- a/irc/dcc/Makefile
+++ b/irc/dcc/Makefile
@@ -22,9 +22,8 @@ COMMENT= DCC support program for irchat-pj
USE_BZIP2= yes
PLIST_FILES= bin/dcc
ALL_TARGET= dcc
-LDFLAGS= ${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
CFLAGS+= ${PTHREAD_CFLAGS} -DUSE_PTHREAD -DENABLE_PTHREAD_ATTR
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dcc ${PREFIX}/bin
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 4a86b2c2d66c..ef3ae74263ea 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -21,14 +21,13 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_GNOME= gnomehack gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-kde
MAKE_JOBS_SAFE= yes
MAN1= lostirc.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
.if !defined(NOPORTDOCS)
diff --git a/irc/miau/Makefile b/irc/miau/Makefile
index 530cf40a43cd..b775d38bbe70 100644
--- a/irc/miau/Makefile
+++ b/irc/miau/Makefile
@@ -32,9 +32,8 @@ CONFIGURE_ARGS= --enable-dccbounce \
--enable-empty-awaymsg \
--enable-dumpstatus \
--disable-dependency-tracking
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="${LIBS}"
+CONFIGURE_ENV= LIBS="${LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
.if defined(WITH_IPV6)
CONFIGURE_ARGS+= --enable-ipv6
diff --git a/irc/netwalker-ircc/Makefile b/irc/netwalker-ircc/Makefile
index d16fc607f13a..3c4e6f8bde1f 100644
--- a/irc/netwalker-ircc/Makefile
+++ b/irc/netwalker-ircc/Makefile
@@ -20,7 +20,7 @@ LICENSE= GPLv2
MAN1= netwalker.1
-LDFLAGS= -lncurses ${PTHREAD_LIBS}
+LDFLAGS+= -lncurses ${PTHREAD_LIBS}
CFLAGS?= -O2 -Wall
post-patch:
diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
index 6195c29f292f..52893180d123 100644
--- a/irc/ngircd/Makefile
+++ b/irc/ngircd/Makefile
@@ -20,8 +20,8 @@ LICENSE= GPLv2
USE_RC_SUBR= ngircd
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN5= ngircd.conf.5
MAN8= ngircd.8
diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index 455ed94a4a92..9625a3c35bfa 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -33,8 +33,8 @@ SUB_LIST= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--sysconfdir=${PREFIX}/etc/ \
diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index f94b2328ccc5..41a09da76a9b 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -38,7 +38,6 @@ SUB_LIST+= RUNDIR=${RUNDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= ${CPPFLAGS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-listen=5 \
--with-dpath=${CONFIGDIR} \
--with-spath=${PREFIX}/libexec/ircd \
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index 891a9e761603..852d5542d40f 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -25,7 +25,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
CCFLAGS+= -Wall -O2 -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= CCFLAGS="${CCFLAGS}"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
PLIST_FILES= lib/xchat/plugins/xfish.so
PORTDOCS= FiSH-xchat.txt \
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 7bd3af38a661..f7403a119c5a 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -26,8 +26,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui gnomedocutils desktopfileutils
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --disable-tcl
GCONF_SCHEMAS= apps_xchat.schemas notification.schemas urlscraper.schemas
INSTALLS_ICONS= yes
@@ -70,10 +70,10 @@ PLIST_SUB+= PYTHON="@comment "
.if defined(WITH_TCL)
LIB_DEPENDS+= tcl83.1:${PORTSDIR}/lang/tcl83
CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
- -I${LOCALBASE}/include/tcl8.3" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-L${LOCALBASE}/lib/tcl8.3"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+ -I${LOCALBASE}/include/tcl8.3
PLIST_SUB+= TCL=""
.else
CONFIGURE_ARGS+=--enable-tcl=no
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 73b70d1b7862..a1a5f7f9c763 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --enable-ipv6
WANT_PERL= yes
@@ -103,10 +103,10 @@ PLIST_SUB+= PYTHON="@comment "
USE_TCL= 84+
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
- -I${TCL_INCLUDEDIR}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-L${TCL_LIBDIR}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+ -I${TCL_INCLUDEDIR}
PLIST_SUB+= TCL=""
.else
CONFIGURE_ARGS+=--enable-tcl=no
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 4af03959bfac..5d2bf6d573bc 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -27,8 +27,8 @@ USE_GNOME= gtk12
WANT_GNOME= yes
GNU_CONFIGURE= yes
# Assign with `+=' for slave ports
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --without-included-gettext \
--enable-nls \
--enable-ipv6 \
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index bd07c05fa9f2..f48e49969866 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -94,7 +94,7 @@ PLIST_SUB+= PYTHON="@comment "
.if defined(WITH_SASL)
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --enable-sasl
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= SASL=""
.else
PLIST_SUB+= SASL="@comment "
diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 1929ea73ad66..31993a2fbc3f 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -25,7 +25,7 @@ SKKDIR?= share/skk
SKKJISYO_TYPE?= L
SKKJISYOCDB?= ${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb
-MAKE_ENV+= LOCALBASE="${LOCALBASE}" CFLAGS="${CFLAGS}"
+MAKE_ENV+= LOCALBASE="${LOCALBASE}"
MAKE_ENV+= SKKJISYOCDB="${SKKJISYOCDB}"
.if !defined(NOPORTDOCS)
PORTDOCS= ${PORTDOCS_FILE} ${PORTDOCS_SH}
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index a20d50fcfa09..862d90cd85b9 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= ebview.desktop
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index ab3fe81888ed..779d28b90737 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -21,12 +21,11 @@ CONFLICTS= ja-ebview-gtk2-*
USE_GNOME= imlib
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 7eb765da412d..fa4f58a5012b 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -161,7 +161,6 @@ BROKEN= does not build
.if ${ARCH} == "ia64"
BROKEN= Segfault during build on ia64
CFLAGS:= ${CFLAGS:C/-O.?/-O0/g}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}"
.endif
pre-everything::
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 187a19ee9dee..84af29517683 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/esecannaserver:${PORTSDIR}/japanese/esecanna
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${PREFIX}/include/wnn6" \
- LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+LDFLAGS+= -L${PREFIX}/lib
+CFLAGS+= -I${PREFIX}/include/wnn6
DIST_SUBDIR= esecanna
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index b88ab7a7aaf0..82131c6254fa 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= icq.0:${PORTSDIR}/japanese/libicq
USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-gnome --disable-nls
-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/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile
index 406ce1b0000e..9d94c143ad58 100644
--- a/japanese/gtkicq/Makefile
+++ b/japanese/gtkicq/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-gnome --datadir=${PREFIX}/share/gtkicq
-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/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 24d50b74e5d5..722adb032730 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -23,13 +23,12 @@ USE_GNOME= gconf2 gnomehack gnomeprefix intlhack libglade2
USE_PERL5_BUILD= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= im-ja-conf.1 im-ja-xim-server.1
GCONF_SCHEMAS= im-ja.schemas
-CPPFLAGS= -I${LOCALBASE}/include -DNO_MALLOC_H
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DNO_MALLOC_H
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index e62a793f480c..3ab22b9178dc 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS?= anthy.1:${PORTSDIR}/japanese/anthy
USE_GNOME= gtk12
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/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index b2edbc2bf8a6..6772c4b78138 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -20,10 +20,9 @@ USE_GNOME= gnomehier gtk20
LIB_DEPENDS= anthy.1:${PORTSDIR}/japanese/anthy
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= kasumi.1
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index de38aa5229c9..4c2183f26049 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -19,8 +19,8 @@ USE_PERL5_BUILD= 5.8.0+
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I ${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I ${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# Default charset (euc-jp/shift_jis/utf-8)
.if defined(WITH_CHARSET)
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 951351e4f6b2..aedee0055645 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -66,8 +66,7 @@ USE_AUTOTOOLS= automake autoconf
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/mutt-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
- LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
CONFIGURE_ARGS= --with-slang --enable-locales-fix \
--with-libiconv-prefix=${LOCALBASE} \
--without-wc-funcs \
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 7209d8bf3efe..36f9c52ace4c 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -38,7 +38,7 @@ USE_AUTOTOOLS= automake autoconf
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
CONFIGURE_ARGS= --with-slang --enable-locales-fix \
--with-libiconv-prefix=${LOCALBASE} \
--without-wc-funcs \
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index e1cffb8720d5..3eb178402f9b 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -43,7 +43,6 @@ GRAPHICS= X11_GRAPHICS
.if ${PKGNAMESUFFIX} == "-gnome"
CATEGORIES+= gnome
USE_GNOME= gnomelibs
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GRAPHICS= GNOME_GRAPHICS
.elif ${PKGNAMESUFFIX} == "-nox11"
GRAPHICS= # none
diff --git a/japanese/php5-mecab/Makefile b/japanese/php5-mecab/Makefile
index 9113d9351e57..a3bea4893140 100644
--- a/japanese/php5-mecab/Makefile
+++ b/japanese/php5-mecab/Makefile
@@ -22,8 +22,8 @@ USE_PHP= yes
DEFAULT_PHP_VER=5
USE_PHPEXT= yes
CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
.include <bsd.port.pre.mk>
diff --git a/japanese/py-zinnia/Makefile b/japanese/py-zinnia/Makefile
index 266ed6367704..03bbdc77dcdc 100644
--- a/japanese/py-zinnia/Makefile
+++ b/japanese/py-zinnia/Makefile
@@ -28,7 +28,7 @@ PYDISTUTILS_PKGVERSION= 0.0.0
.include <bsd.port.pre.mk>
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV:= ${CONFIGURE_ENV}
post-extract:
diff --git a/japanese/quit/Makefile b/japanese/quit/Makefile
index bb7d5eed4e30..f1b6d4ed5f5b 100644
--- a/japanese/quit/Makefile
+++ b/japanese/quit/Makefile
@@ -11,6 +11,6 @@ MAINTAINER= nork@FreeBSD.org
MASTERDIR= ${.CURDIR}/../../games/quit
-CPPFLAGS= -DJAPANESE
+CPPFLAGS+= -DJAPANESE
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index 8b04a4013fca..3d73cd3560d9 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ARGS= --enable-xpm-background --enable-transparency \
--enable-utmp --enable-wtmp \
--with-xpm --with-xpm-includes=${LOCALBASE}/include/X11 \
--with-xpm-library=${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCDIR= ${PREFIX}/share/doc/ja/rxvt
RXVTLIB= ${PREFIX}/lib/X11/rxvt
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index d87a05fc8631..8c77887f7d4b 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index d6cf17099aed..91d6e608b496 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -25,8 +25,8 @@ USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 86d5b9284d8e..9283246734b2 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -26,8 +26,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index cb3fb5a1fe36..a844646650e3 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -29,8 +29,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index b0682cd6c354..99393e2d1460 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
@${ECHO_CMD}
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 9ee2e33ad0d8..b31abae9c4cd 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -24,8 +24,8 @@ USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 307cce7c8984..434fd3133f51 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -24,9 +24,10 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" ${WRKSRC}/src/scim_skk_prefs.h
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 5100fc39c4e9..49de49a67043 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -23,9 +23,9 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- SCIM_DATADIR=${PREFIX}/share/scim \
+CONFIGURE_ENV+= SCIM_DATADIR=${PREFIX}/share/scim \
SCIM_ICONDIR=${PREFIX}/share/scim/icons
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --disable-skim-support
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 95cff36cc1c7..f4c6d3502c7f 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -25,9 +25,10 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/scim-tomoe \
lib/scim-1.0/1.4.0/Helper/tomoe.a \
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index b55ae92a5346..be2aab1983c2 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -26,9 +26,10 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 56cc63ef46a4..fb366b1a5eb1 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
USE_AUTOTOOLS= autoconf213
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared
-CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
+CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
PKGINSTALL= ${PORTSDIR}/lang/tcl82/pkg-install.tclsh
PKGDEINSTALL= ${PORTSDIR}/lang/tcl82/pkg-deinstall.tclsh
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 5997d3c75384..47ebbecbf0c4 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -36,8 +36,8 @@ USE_AUTOTOOLS= autoconf213
USE_XORG= x11
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
--enable-xlibHack --enable-onTheSpot
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
RANLIB= ranlib
USE_LDCONFIG= yes
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index 4e673bea166e..0c82a74243cc 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -106,12 +106,12 @@ CONFIGURE_ARGS+=--disable-unihan
PLIST_SUB+= UNIHAN="@comment "
.endif
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/ruby-${RUBY_VER} \
- -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
- PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
+CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
pyexecdir=${PYTHON_SITELIBDIR} \
GMSGFMT="${LOCALBASE}/bin/msgfmt"
+CFLAGS+= -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/ruby-${RUBY_VER} \
+ -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
.if defined(WITH_UNIHAN)
post-extract:
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 4dc3dbb7bf73..5c3c1c82ce0c 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -54,8 +54,8 @@ CONFIGURE_ENV= INSTALL="${INSTALL}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_MAN="${INSTALL_MAN}" \
- XDEFS='-DMFMODE=\"${MF_MODE}\"' \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+ XDEFS='-DMFMODE=\"${MF_MODE}\"'
+CFLAGS+= -I${LOCALBASE}/include
SCRIPTS_ENV= MV=${MV} SED=${SED}
PATCH_STRIP= -p1
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index 076b5b9c41c5..db6e0bb7715f 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -22,8 +22,8 @@ JAVA_VERSION= 1.5+
GNU_CONFIGURE= yes
MAN1= cacao.1
CONFIGURE_ARGS+= --with-classpath-prefix=${LOCALBASE}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 47dbe7556200..698d1699dc2b 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -25,7 +25,7 @@ USE_XORG= x11 ice xtst xaw xproto xext
WANT_GNOME= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
+CXXFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --enable-jni --disable-alsa --disable-dssi --disable-plugin
USE_GMAKE= yes
diff --git a/java/jamvm/Makefile b/java/jamvm/Makefile
index 4ab20683ed2e..020c5ffc2db0 100644
--- a/java/jamvm/Makefile
+++ b/java/jamvm/Makefile
@@ -27,7 +27,8 @@ OPTIONS= FFI "use libffi to call native methods" ON \
.if defined(WITH_FFI)
LIB_DEPENDS+= ffi:${PORTSDIR}/devel/libffi
CONFIGURE_ARGS+= --enable-ffi
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} `pkg-config libffi --cflags`" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= `pkg-config libffi --cflags`
.endif
.if defined(WITH_ZIP)
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 2f12e5ee89f7..17e8457fb471 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -27,8 +27,8 @@ JAVA_BUILD= jre
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-classpath=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= jc
ONLY_FOR_ARCHS= i386
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index 080a0c6305f1..5ff3cecacaf2 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
-CONFIGURE_ENV= CFLAGS="-I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CFLAGS+= -I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index 05cda4df4bac..e5fd80523678 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -26,7 +26,8 @@ USE_LDCONFIG= yes
USE_GNOME= pkgconfig
PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include `${PKG_CONFIG} libffi --cflags`" LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include `${PKG_CONFIG} libffi --cflags`
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME}
OPTIONS= SVMCP "Install SableVM classpath" ON \
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 05f6fd62f43b..f2af6dd6aafc 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -27,8 +27,8 @@ GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index 5e0222a67630..f73ae67d5c7e 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -24,8 +24,8 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-boxchar --enable-ansi-color \
--enable-256-color --enable-chat --enable-now-chat
-CONFIGURE_ENV+= LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV+= LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CFLAGS+= -I${LOCALBASE}/include
MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
MAN1= hanterm.1
diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index ea701746b495..fab7db5d59a9 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -28,8 +28,8 @@ USE_PYTHON= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index eb85e47b0383..585d5d81ded1 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index d158eaf515b7..5e140a329dba 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index 7ba7980ae24c..5a7eeabc9d12 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index fd3a652c0f1b..d1beacd6f8cb 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index a4f7dbaa813d..d68db524dea8 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -29,14 +29,13 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" \
--elispdir="${DATADIR}/emacs" --vimdir="${DATADIR}/vim" \
--docdir="${DOCSDIR}"
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
# Complaints if the environment changes between build stages.
MAKE_ENV= ${CONFIGURE_ENV}
BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE=yes
OPTIONS= BDB "Build Berkeley Database module" Off \
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 7373e51f19b3..6269b08232f7 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -20,9 +20,8 @@ USE_GMAKE= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-system-gmp --enable-boehm=system
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
OPTIONS= ASDF "Enable ASDF building facility" on \
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 0d04da660fb6..6463dd59692d 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -20,14 +20,13 @@ LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm \
USE_BZIP2= yes
USE_MOTIF= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
MAN1= elk.1
-CPPFLAGS= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index d5abaafbdec7..9598d8ff8b1e 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -113,7 +113,6 @@ CONFIGURE_ARGS+=--enable-threads --enable-dynamic-ssl-lib --enable-sctp
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN}
.if ${ARCH} == i386
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index d5abaafbdec7..9598d8ff8b1e 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -113,7 +113,6 @@ CONFIGURE_ARGS+=--enable-threads --enable-dynamic-ssl-lib --enable-sctp
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN}
.if ${ARCH} == i386
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 1e5fd7d705ac..70d055dd3eb1 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= 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}
USE_LDCONFIG= yes
PLIST_SUB= MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile
index 38242265d262..be861da261f7 100644
--- a/lang/gambas2-base/Makefile
+++ b/lang/gambas2-base/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug \
--disable-optimization \
--disable-preloading \
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 295d22348778..472b11224193 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -35,7 +35,8 @@ CONFIGURE_ARGS=--prefix=${PREFIX} \
--disable-statsysbfd \
--disable-locbfd \
--enable-custreloc
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib
+CONFIGURE_ENV= C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib
+CFLAGS+= -I${LOCALBASE}/include
MAKEFILE= makefile
INFO= gcl-si gcl-tk
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 9017ca3b7f7c..aaa829cf7f5a 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -16,9 +16,9 @@ MAINTAINER= stas@FreeBSD.org
COMMENT= Fast and portable Forth system
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_GMAKE= yes
ALL_TARGET= all info
USE_EMACS= yes
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 0176dda2b9ab..11069d7900b2 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -114,7 +114,7 @@ CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} --with-gcc=${CC} \
--with-iconv-libraries=${LOCALBASE}/lib
# libgmp:
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
# override TMPDIR because /tmp often doesn't have enough space
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index d5b5db3e53a9..89915677b090 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -26,8 +26,8 @@ USE_PYTHON= build
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
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/lang/intercal/Makefile b/lang/intercal/Makefile
index 0ad85d971c04..3f4ccd3ed4a4 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -16,7 +16,7 @@ COMMENT= The C-INTERCAL compiler, ick, and supporting libraries
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -D_POSIX_SOURCE"
+CFLAGS+= -D_POSIX_SOURCE
post-patch:
#
diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile
index 97b71ed34db1..4b42b93c6124 100644
--- a/lang/klogoturtle/Makefile
+++ b/lang/klogoturtle/Makefile
@@ -15,7 +15,7 @@ COMMENT= LOGO Interpreter for the KDE Desktop
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile
index 520a4ded07b1..819548b75a4b 100644
--- a/lang/libhx/Makefile
+++ b/lang/libhx/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= sylvio@FreeBSD.org
COMMENT= Library C with some additional C++ bindings available
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_XZ= yes
USE_LDCONFIG= yes
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index ef0b9c5114ab..0cd9dcd8c82b 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -26,7 +26,6 @@ USE_GNOME= gnomehack
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-aclocaldir=${PREFIX}/share/aclocal \
--with-stack-direction=-1
USE_LDCONFIG= yes
@@ -35,8 +34,8 @@ MANCOMPRESSED= yes
MAN1= rep.1 rep-remote.1 rep-xgettext.1 repdoc.1
INFO= librep
-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/lang/lush/Makefile b/lang/lush/Makefile
index f5ca70f4a298..3b2732e8aae4 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/lush
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS} -lintl -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --without-bfd
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index a93d3d39d1ca..0ee312a97c34 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \
USE_BISON= build
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --datadir=${DATADIR}
post-patch:
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 011bee4c4179..ff6ba2c3e92f 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile \
USE_GNOME= libglade2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= mdk
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 62981718716e..a135e860d671 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -25,8 +25,9 @@ ALL_TARGET= world MOSMLHOME=${MOSMLHOME}
INSTALL_TARGET= install MOSMLHOME=${MOSMLHOME}
WRKSRC= ${WRKDIR}/mosml/src
USE_PERL5= yes
-MAKE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" DOCSDIR="${DOCSDIR}" \
+MAKE_ENV+= DOCSDIR="${DOCSDIR}" \
LD_RUN_PATH="${PREFIX}/lib/mosml"
+LDFLAGS+= -L${LOCALBASE}/lib
PKGMESSAGE= ${WRKDIR}/pkgmessage
diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index 860347682d20..a1555ac1c725 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
# Nickle now has bindings which are likely to pull in libraries that need
# libpthread. Link to it now, since it wouldn't work at runtime.
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
MAN1= nickle.1
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile
index 288587d97831..557481368414 100644
--- a/lang/ofc/Makefile
+++ b/lang/ofc/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
USE_LDCONFIG= 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}
OPTIONS= GDBM "Add gdbm support" off \
GMP "Add gmp support" off
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 980380724bce..614b53e6622f 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -22,8 +22,8 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGC_PTR='void*'" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DGC_PTR='void*'
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= oo2c.1 oob.1 ooef.1 oowhereis.1
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index 14441dcc9bb8..50d734fbd8aa 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -21,13 +21,12 @@ LATEST_LINK= open-cobol-devel
USE_BDB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INFO= open-cobol
-CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index daca1342cbd3..a06bf6b026a1 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -22,13 +22,12 @@ CONFLICTS= open-cobol-1.[1]*
USE_BDB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INFO= open-cobol
-CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/lang/php52/Makefile b/lang/php52/Makefile
index 802329417ed0..e2144b724e30 100644
--- a/lang/php52/Makefile
+++ b/lang/php52/Makefile
@@ -170,10 +170,8 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \
pthreads_working="yes" \
lt_cv_path_SED="sed"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-
.if defined(WITH_LINKTHR)
-CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}"
+CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}"
.endif
.if defined(WITH_DEBUG)
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index e8f527905880..6eb92db7cd60 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -49,7 +49,6 @@ MAN1= pike.1
WANT_MESA= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS}
CONFIGURE_ARGS+= --without-debug \
--with-thread-library=${PTHREAD_LIBS} \
--with-double-precision \
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index a9754b9a700b..3d2dfb45427d 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -69,12 +69,9 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
.else
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.else
CONFIGURE_ARGS+= --without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
.endif # !defined(WITHOUT_THREADS)
.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index e67b7e3df38d..7fd4f7ee198c 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -73,12 +73,9 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
.else
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.else
CONFIGURE_ARGS+= --without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
.endif # !defined(WITHOUT_THREADS)
.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 8f742fcc5e9b..dfc413af7b28 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -89,12 +89,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth
LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth
_PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth"
_PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth"
-CONFIGURE_ENV+= CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}"
-CONFIGURE_ENV+= LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}"
+CPPFLAGS+= ${_PTH_CPPFLAGS}
+LDFLAGS+= ${_PTH_LDFLAGS}
.else # !defined(WITH_PTH)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.endif # defined(WITH_PTH)
.if defined(WITHOUT_HUGE_STACK_SIZE)
CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
@@ -104,9 +104,6 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
.endif # !defined(WITHOUT_THREADS)
.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 9e95b226855d..b4a9a139cdea 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -91,12 +91,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth
LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth
_PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth"
_PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth"
-CONFIGURE_ENV+= CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}"
-CONFIGURE_ENV+= LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}"
+CPPFLAGS:= ${_PTH_CPPFLAGS} ${CPPFLAGS}
+LDFLAGS+= ${_PTH_LDFLAGS}
.else # !defined(WITH_PTH)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.endif # defined(WITH_PTH)
.if defined(WITHOUT_HUGE_STACK_SIZE)
CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
@@ -106,9 +106,6 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
.endif # !defined(WITHOUT_THREADS)
.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
@@ -130,7 +127,7 @@ PLIST_SUB+= 32BIT_ONLY="@comment "
PLIST_SUB+= 32BIT_ONLY=""
.endif
.if ${ARCH} == powerpc64
-MAKE_ENV+= UNAME_m="powerpc64"
+MAKE_ENV+= UNAME_m="powerpc64"
.endif
.if ${ARCH} == sparc64
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 9389dfa372fb..54279db975e5 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -75,13 +75,10 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
.else
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
.endif # !defined(WITHOUT_THREADS)
.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 5fc533074b86..85939aaf5095 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -76,13 +76,10 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
.else
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif # defined(LDFLAGS)
.endif # !defined(WITHOUT_THREADS)
.if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile
index d7dfb22e27e1..2444c54fc2c5 100644
--- a/lang/racket-textual/Makefile
+++ b/lang/racket-textual/Makefile
@@ -48,8 +48,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/cjpeg:${PORTSDIR}/graphics/jpeg \
${LOCALBASE}/libdata/pkgconfig/pango.pc:${PORTSDIR}/x11-toolkits/pango
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-
# Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index d7dfb22e27e1..2444c54fc2c5 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -48,8 +48,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/cjpeg:${PORTSDIR}/graphics/jpeg \
${LOCALBASE}/libdata/pkgconfig/pango.pc:${PORTSDIR}/x11-toolkits/pango
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-
# Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 007fc67734ae..f332578f85c3 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -19,8 +19,7 @@ CONFLICTS= rexx-regina-* oorexx-[0-9]*
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Make
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- PREFIX="${PREFIX}"
+CONFIGURE_ENV= PREFIX="${PREFIX}"
CONFIGURE_ARGS= o all
# configures and builds in one step
diff --git a/lang/runawk/Makefile b/lang/runawk/Makefile
index b556d680f5f5..7acce93bd462 100644
--- a/lang/runawk/Makefile
+++ b/lang/runawk/Makefile
@@ -15,8 +15,9 @@ COMMENT= Wrapper for AWK interpreter that implements a modules system
BUILD_DEPENDS= mk-configure>=0.21.0:${PORTSDIR}/devel/mk-configure
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include" SUBPRJ_DFLT="${SUBPRJ_DFLT}"
+MAKE_ENV+= SUBPRJ_DFLT="${SUBPRJ_DFLT}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib
MAN1= ${PORTNAME}.1 alt_getopt.1
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index 9d894f2f550f..832a6f72ac94 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Unix shell embedded into Scheme, with access to all Posix calls
CONFLICTS= scheme48-[0-9]*
-CONFIGURE_ENV+= LDFLAGS="-Wl,-E"
+LDFLAGS+= -Wl,-E
.include <bsd.port.pre.mk>
diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index d8b5ed469bc7..0a753bed3e94 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -36,7 +36,6 @@ OPTIONS= MCS51 "Intel 8051 port" on \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --docdir=${DOCSDIR}
.include <bsd.port.pre.mk>
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index 744202ebb118..0eda26a727e0 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -34,7 +34,6 @@ OPTIONS= MCS51 "Intel 8051 port" on \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --docdir=${DOCSDIR}
.include <bsd.port.pre.mk>
diff --git a/lang/see-devel/Makefile b/lang/see-devel/Makefile
index 0645153052c8..8b970f63b9ad 100644
--- a/lang/see-devel/Makefile
+++ b/lang/see-devel/Makefile
@@ -28,8 +28,8 @@ USE_LDCONFIG= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/lang/see/Makefile b/lang/see/Makefile
index 369941d7f1ba..bf0a50f424d8 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index d047dbeb6af4..90bd2ffcdb6e 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -32,8 +32,7 @@ USE_SQLITE= yes
USE_GMAKE= yes
USE_GL= gl glut
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- ac_cv_prog_EMACS=no
+CONFIGURE_ENV= ac_cv_prog_EMACS=no
CONFIGURE_ARGS= --enable-generational-gc=no \
--enable-gtk=no \
--with-emacs=no \
@@ -51,8 +50,8 @@ MAN1= gst.1 gst-load.1 gst-package.1 gst-sunit.1 gst-config.1 \
MLINKS= gst-load.1 gst-reload.1
INFO= gst gst-base gst-libs
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/lang/stklos/Makefile b/lang/stklos/Makefile
index 09de334083c9..07011c909f31 100644
--- a/lang/stklos/Makefile
+++ b/lang/stklos/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="${PORTVERSION}"
GNU_CONFIGURE= yes
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 4a56ccf61ba2..f712d9cbbf24 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -38,7 +38,7 @@ NOPRECIOUSMAKEVARS= yes
USE_GMAKE= yes
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" ARCH=${ARCH}-${OPSYS:L}
+CONFIGURE_ENV= ARCH=${ARCH}-${OPSYS:L}
CONFIGURE_TARGET= ${ARCH}-${OPSYS:L}
CONFIGURE_ARGS= --with-world --without-jpl
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 7eff9c563439..ba018119d637 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -20,8 +20,8 @@ USE_TCL= 83+
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${TCL_INCLUDEDIR}/unix\
- -I${TCL_INCLUDEDIR}/generic"
+CPPFLAGS+= -I${TCL_INCLUDEDIR}/unix\
+ -I${TCL_INCLUDEDIR}/generic
CONFIGURE_ARGS= --enable-shared \
--with-help=Help \
--with-tcl="${TCL_LIBDIR}"
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 6c7785484f29..f899439a5fbb 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -20,7 +20,8 @@ USE_XZ= yes
USE_GNOME= gnomehack glib20 gnomeprefix libxslt
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}
+LDFLAGS+= -L${LOCALBASE}/lib
USE_BISON= build
USE_LDCONFIG= yes
diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 58bd9cff7deb..f75c54654f13 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -17,7 +17,6 @@ COMMENT= An addressbook program with mutt mail client support
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/akpop3d/Makefile b/mail/akpop3d/Makefile
index f3f70e47540f..3c726d247b48 100644
--- a/mail/akpop3d/Makefile
+++ b/mail/akpop3d/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
.if defined(WITH_SSL)
USE_OPENSSL= YES
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${OPENSSLBASE}/include"
+CPPFLAGS+= -I${OPENSSLBASE}/include
LDFLAGS+= -L${OPENSSLBASE}/lib -lssl -lcrypto
.endif
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index b0e498809b2c..b7c806d2b5e0 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -27,8 +27,8 @@ MAN1= anubis.1
INFO= anubis
PORTEXAMPLES= 1anubisrc 2anubisrc
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
OPTIONS= NLS "Native language support" on \
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index b409a2dacec2..4c34e25a57d3 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -17,7 +17,6 @@ COMMENT= Biff-type program, designed to match AfterStep
USE_XORG= xpm
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shaping \
--with-xpm \
--with-xpm-includes=${LOCALBASE}/include \
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 85c77399cc47..60f94942e41a 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS= --enable-threads \
--with-ssl \
--without-nm \
--with-canberra
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
MAN1= balsa.1
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index dd59e981babe..8b75092ec1b5 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -16,15 +16,15 @@ COMMENT= A fast Bayesian Mail Filter compatible with maildrop and procmail
.if defined(WITH_BDB41)
LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= DB_LIBNAME=-ldb41
.elif defined(WITH_BDB4)
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= DB_LIBNAME=-ldb4
.elif defined(WITH_BDB3)
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= DB_LIBNAME=-ldb3
.endif
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 243f009f3b00..576c5b5ed174 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -51,8 +51,9 @@ LIB_DEPENDS+= gsl.16:${PORTSDIR}/math/gsl
CONFIGURE_ARGS+= --with-included-gsl
.endif
CPPFLAGS+= ${BF_CPPFLAGS}
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" LIBS="${BF_LIBS}" \
+CONFIGURE_ENV+= LIBS="${BF_LIBS}" \
PERL="${PERL}"
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man
MAN1= bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1 \
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index 356cdf3a3cac..7e25c6dff14c 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -25,7 +25,7 @@ USE_ICONV= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index d30c15a8a3a7..2bd1ff596d3c 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-iconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index 1a03eb2d799e..0bbb7083e4ca 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index 72aafca46738..093bc5fd2c1f 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -26,7 +26,7 @@ USE_ICONV= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 5e265621fb45..684f602d9274 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -28,7 +28,7 @@ USE_GNOME= gtk20
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 3577098821c3..0bf9f4dcd1c3 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -27,7 +27,7 @@ USE_ICONV= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index d0b19093a4a2..62e9293e674a 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 8db463ca5869..2f9bd6bd987c 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -27,7 +27,7 @@ USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 87b1b2188910..47ac84d79ba9 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -26,7 +26,7 @@ USE_ICONV= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index af6242547cff..a838eb888679 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -27,7 +27,7 @@ USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 1a6480ada738..d828a94359ca 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -25,8 +25,8 @@ USE_XORG= x11
USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index a8a344dcdeaf..c7e2efdb6ca5 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -28,7 +28,7 @@ USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 1bcc18c43618..feebf7cbf864 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -46,8 +46,8 @@ CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= ALL "Enable all options." off \
ENCHANT "Enable spell checking support." on \
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index ff0b988e99c9..27a7d25c9c42 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= evolutiondataserver gnomehack gnomepanel gnomeprefix \
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 75f9703af20a..9fb4ac1355fd 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -25,13 +25,10 @@ USE_GMAKE= yes
USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \
courier-imap-pop3d courier-imap-pop3d-ssl
-
CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib
-CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash \
- CPPFLAGS='${CPPFLAGS}' \
- CXXFLAGS='${CPPFLAGS}' \
- LDFLAGS='${LDFLAGS}'
+CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash
+
MAKE_ENV:= ${CONFIGURE_ENV}
#
@@ -100,8 +97,7 @@ CONFIGURE_ARGS+=--with-trashquota
.endif
.if defined(WITH_FAM)
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_FAM= yes
.endif
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 3e4d798216a4..238351de9a2f 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -73,8 +73,6 @@ USE_RC_SUBR= courier.sh
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \
- LDFLAGS='${LDFLAGS}'
MAKE_ENV:= ${CONFIGURE_ENV}
CONFIGURE_ARGS= --disable-root-check \
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index d05c124cb4d1..ecb0f1cfbcbb 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -38,7 +38,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-com_err \
--with-openssl=${OPENSSLBASE} \
--with-perl=${PERL5}
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
OPTIONS= AUTOCREATE "Use autocreate INBOX patch (UoA)" off \
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 72ed06208a47..6bbb06097717 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -38,7 +38,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-com_err \
--with-openssl=${OPENSSLBASE} \
--with-perl=${PERL5}
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
OPTIONS= AUTOCREATE "Use autocreate INBOX patch (UoA)" off \
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 0494516daecf..63cd45e405a0 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -32,7 +32,7 @@ USE_OPENSSL= YES
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail
MAKE_ARGS+= mandir=${MANPREFIX}/man
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
index f8795f81115c..58f023928cd7 100644
--- a/mail/dbmail20/Makefile
+++ b/mail/dbmail20/Makefile
@@ -43,7 +43,7 @@ CFLAGS+= -I${LOCALBASE}/include/mysql
LDFLAGS+= -L${LOCALBASE}/lib/mysql
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
PORTDOCS= INSTALL README EXTRAS
MAN1= dbmail-smtp.1
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index 14948847c59b..40904a73d711 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -35,7 +35,7 @@ USE_OPENSSL= YES
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
README.aliases README.exim README.ldap \
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 0494516daecf..63cd45e405a0 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -32,7 +32,7 @@ USE_OPENSSL= YES
CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail
MAKE_ARGS+= mandir=${MANPREFIX}/man
diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile
index 9dc49db2ec80..7df3f32cbfff 100644
--- a/mail/dbmail23/Makefile
+++ b/mail/dbmail23/Makefile
@@ -38,7 +38,7 @@ USE_OPENSSL= YES
CFLAGS+= -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include/zdb ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
CONFIGURE_ARGS+=--with-pkglibdir=${LOCALBASE}/lib/dbmail \
--sysconfdir=${PREFIX}/etc
MAKE_ARGS+= mandir=${MANPREFIX}/man
diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index 2b6eb7eebe20..f7c1410695fd 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -113,7 +113,6 @@ MILTERLIB= ${MILTERBASE}/lib
CPPFLAGS+= -I${MILTERINC}
LDFLAGS+= -L${MILTERLIB}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --with-sendmail=${MILTERBASE}
PLIST_SUB+= WITH_DCCM=""
diff --git a/mail/dovecot-sieve/Makefile b/mail/dovecot-sieve/Makefile
index 0d37e6d68c40..be4876de9c8d 100644
--- a/mail/dovecot-sieve/Makefile
+++ b/mail/dovecot-sieve/Makefile
@@ -26,7 +26,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --prefix=${PREFIX} \
--docdir=${DOCSDIR} \
--with-dovecot=`${MAKE} -C ${PORTSDIR}/mail/dovecot -V WRKSRC`
-CONFIGURE_ENV= LDFLAGS='${LDFLAGS}'
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/dovecot/lda
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index a7a9ad5cf444..3efae3d59456 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --localstatedir=/var \
--with-statedir=/var/db/dovecot \
--without-shadow
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/dovecot \
${PREFIX}/lib/dovecot/imap \
${PREFIX}/lib/dovecot/pop3 \
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index e10d113e301d..4f770b4b9a59 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --prefix=${PREFIX} \
--docdir=${DOCSDIR} \
--with-dovecot="${LOCALBASE}/lib/dovecot"
-CONFIGURE_ENV= LDFLAGS='${LDFLAGS}'
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/dovecot
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index c5d4c4700954..ccd66624a2cd 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -36,8 +36,8 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --localstatedir=/var \
--with-statedir=/var/db/dovecot \
--without-shadow
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/dovecot
.if defined(NOPORTDOCS)
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 76c335d22b47..8b7d4abdb717 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -81,10 +81,10 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
#CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= ${PTHREAD_CFLAGS}
.ifdef(GDBS)
CFLAGS+= -g -DDEBUG
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 3a801dff6f51..6f850c82db9d 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -25,10 +25,8 @@ USE_PERL5_RUN= yes
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
MAN1= elmo.1 elmoconf.pl.1
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 32b4546952dc..65e0b21d024b 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -24,10 +24,8 @@ USE_PERL5_RUN= yes
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
MAN1= elmo.1 elmoconf.pl.1
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 50db0d96bd40..86e56fdd08ff 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -21,7 +21,6 @@ USE_BZIP2= yes
USE_OPENSSL= yes
USE_BISON= build
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= esmtp.1
MAN5= esmtprc.5
@@ -30,8 +29,8 @@ PLIST_FILES= bin/esmtp etc/esmtprc.sample
SUB_FILES= pkg-message
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
.for file in ${PORTNAME}.1
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index d9459c32e264..74c51155689a 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -27,8 +27,8 @@ USE_GMAKE= yes
USE_BDB= 41
USE_OPENLDAP= yes
USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no \
--with-libdb=${LOCALBASE}
@@ -54,7 +54,7 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
.endif
.if ${ARCH} == "amd64"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+= -fPIC
.endif
.if exists(${LOCALBASE}/include/mapi.h)
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 896d4031f61b..c9d52b571e0a 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE= yes
USE_GNOME= evolutiondataserver
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
EVO_VERSION= 2.32
EDS_VERSION= 1.2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 6bc63ffda7d7..7c185060bd13 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -38,8 +38,8 @@ CONFIGURE_ARGS= --enable-nss=yes \
--enable-mono=no \
--disable-nm \
--with-sub-version=" FreeBSD GNOME Team Port"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= apps_evolution_addressbook.schemas \
apps-evolution-attachment-reminder.schemas \
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 370fe742f707..d247328c5a83 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -38,8 +38,8 @@ WITH_AUDIO= # none
PLIST_SUB+= X11=""
USE_GNOME= gnomehack gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I../compface -I${LOCALBASE}/include" \
- LDFLAGS="-L../compface -L${LOCALBASE}/lib"
+CPPFLAGS+= -I../compface -I${LOCALBASE}/include
+LDFLAGS+= -L../compface -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-imap --enable-pop \
--enable-name-unknown --with-spooldir=/var/mail \
--with-facedir=${DATADIR}
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 325da4eb505c..2bbfbacb4918 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -40,7 +40,7 @@ USE_OPENSSL= yes
CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \
--with-hesiod=no --enable-fallback=no PYTHON=:
# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= ${CONFIGURE_ENV}
MAN1= fetchmail.1
MLINKS= fetchmail.1 fetchmailconf.1
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index d556cc5f8c57..827f9890a454 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -33,13 +33,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BISON= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= filtermail.1
MAN5= filtermailex.5 filtermailrc.5
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/filtermail
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 9600b021f80a..e280b4299c27 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= glib12
USE_ICONV= yes
GNU_CONFIGURE= yes
CFLAGS+= -L${LOCALBASE}/lib # req'd to find iconv
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS= confexecdir=${PREFIX}/etc
USE_LDCONFIG= yes
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index b6b9d9280bcb..8ebaec5f2814 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \
--with-html-dir=${PREFIX}/share/doc \
--enable-mono=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LATEST_LINK?= ${PORTNAME}2
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index 8f2a2059517c..aed9f3d0873b 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -27,8 +27,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--enable-mono=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LATEST_LINK?= ${PORTNAME}24
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 1178602007f7..310363ac92f5 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= intlhack libglade2 esound
USE_GMAKE= yes
USE_FAM= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a
# /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long'
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 7f03f4adfb3e..8d67977b20b5 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -37,8 +37,8 @@ PLIST_FILES= bin/${PORTNAME} \
"etc/nail.rc.default" \
"@exec [ -f %B/nail.rc ] || ${CP} %B/%f %B/nail.rc"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 7d069715d277..8161083017d4 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -19,8 +19,8 @@ USE_LUA= 5.1
USE_OPENSSL= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -d ${PREFIX} -s ${DATADIR}
-CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR}
-LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
MAN1= imapfilter.1
MAN5= imapfilter_config.5
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index b3263eb00eb8..d88c6a9b90c8 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -18,16 +18,14 @@ USE_OPENSSL= yes
USE_BDB= 42+
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
LICENSE= GPLv2
MAN1= isync.1 mbsync.1 mdconvert.1
PORTDOCS= AUTHORS ChangeLog NEWS README TODO
PLIST_FILES= bin/get-cert bin/isync bin/mbsync bin/mdconvert
-CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${OPENSSLINC}
-LDFLAGS= -L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${OPENSSLINC}
+LDFLAGS+= -L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto
post-patch:
@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
diff --git a/mail/kavmilter/Makefile b/mail/kavmilter/Makefile
index 41302ee0c8e0..648ce971dfa2 100644
--- a/mail/kavmilter/Makefile
+++ b/mail/kavmilter/Makefile
@@ -23,10 +23,8 @@ USE_BZIP2= yes
MAN5= kavmilter.5
MAN8= kavmilter.8
-CPPFLAGS= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS}
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
post-install:
${STRIP_CMD} ${PREFIX}/libexec/kavmilter
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index a7bdd9b4b2fc..fdff6ffd861e 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -21,10 +21,10 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
# require-all-recipients (implied by enable-all) is required for Balsa
CONFIGURE_ARGS= --enable-all --disable-isoc
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index eaa58560b38c..8eb0fd201b83 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -29,8 +29,6 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-
OPTIONS= GNUTLS "Enable gnuTLS support" off \
IPV6 "Enable ipv6 support." on
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index 8ebc40c283e8..17f9500c9186 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= pkgconfig
USE_PYTHON= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-samba=${LOCALBASE}
OPTIONS= BOOST "Enable libmapi++ (needs boost)" yes \
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index 50af3d027ac5..44de20efe8bb 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -32,7 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-debug
.endif
-CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \
LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
DOCSDIR= ${PREFIX}/share/doc/vmime
diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile
index d230d03204ae..c87c585c1e5b 100644
--- a/mail/lmtpd/Makefile
+++ b/mail/lmtpd/Makefile
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+= --without-db3 --without-db4
.endif
GNU_CONFIGURE= YES
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --without-perl
MAN8= lmtpd.8
diff --git a/mail/lurker/Makefile b/mail/lurker/Makefile
index 3917a4756cc2..f51eabebba18 100644
--- a/mail/lurker/Makefile
+++ b/mail/lurker/Makefile
@@ -22,8 +22,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
MIMELIB_VERSION= 3.1.1
USE_ICONV= 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-mimelib-local \
--with-default-www-dir=${PREFIX}/www/lurker \
--with-cgi-bin-dir=${PREFIX}/www/lurker
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 40fbef072f7c..68c74b4db88f 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -23,8 +23,8 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME= gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
JB_CONF_ARGS= cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${PREFIX}"
JB_CONF_ENV= jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
GCONF_SCHEMAS= mail-notification.schemas
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index fc9c0a39ead3..af934623fc05 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -31,7 +31,6 @@ USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-syslog=1 \
--enable-use-flock=1 \
--with-etcdir="${PREFIX}/etc" \
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index ccf1d43ea77d..9bbffa30cd76 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -16,7 +16,6 @@ COMMENT= Indexing and searching in Maildir, MH or mbox folders
USE_GMAKE= yes
HAS_CONFIGURE= yes
USE_BISON= build
-CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}"
MAN1= mairix.1
MAN5= mairixrc.5
diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile
index fe1ac3cceb36..13d460a787eb 100644
--- a/mail/mboxgrep/Makefile
+++ b/mail/mboxgrep/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
USE_OPENSSL= yes
MAN1= mboxgrep.1
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index eeb0b62519d2..1a58de932bdd 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -81,7 +81,7 @@ LIBS+= ${PTHREAD_LIBS}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} \
--enable-dnsrbl --with-thread-safe-resolver
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LIBS="${LIBS} "
+CONFIGURE_ENV+= LIBS="${LIBS}"
ALL_TARGET= milter-greylist
SUB_FILES+= pkg-message
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index 94b9096b8fae..fde2d8b1c3e5 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//}
USE_GNOME= gnomehack gnomelibs gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -fpermissive
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index 40fb7afae3f5..0d96f082c4bb 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -30,7 +30,7 @@ CXXFLAGS+= -DTHREADMAIL \
-DMAILPATH=\"/var/mail\" \
-DMAILER=\"/usr/sbin/sendmail\ -t\" \
-I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -liconv -lcurses -lmd
+LDFLAGS+= -L${LOCALBASE}/lib -liconv -lcurses -lmd
post-patch:
@${REINPLACE_CMD} -e 's|md5/libmd5.a||g' ${WRKSRC}/Makefile
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 7bac1dc53893..92f0a6fe37fe 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -160,7 +160,7 @@ DOCSDIR?= ${PREFIX}/share/doc/mutt
EXAMPLESDIR?= ${PREFIX}/share/examples/mutt
DATADIR?= ${PREFIX}/share/mutt
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \
--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
--enable-external-dotlock --enable-pop --enable-imap \
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 015c1a5f3b6d..9cf65bd3e9d7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -96,7 +96,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake autoconf
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include"
CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
--with-sharedir=${PREFIX}/share/mutt \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 015c1a5f3b6d..9cf65bd3e9d7 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -96,7 +96,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake autoconf
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include"
CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
--with-sharedir=${PREFIX}/share/mutt \
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index f1c8933731b0..e0be12b17f86 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -27,7 +27,8 @@ MANCOMPRESSED= no
USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
+CONFIGURE_ENV= BDB_LIB=db3
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= DOCSDIR=${DOCSDIR}
CONFIGURE_ARGS+=--disable-daemon-map --localstatedir=/var
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 66c66156acf2..f7f9589360ab 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -16,7 +16,7 @@ COMMENT= A console-based tool for handling Postfix 1, Postfix 2 and Exim queues
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
MAN1= pfqueue.1
MAN5= pfqueue.conf.5
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index bc5376c363fc..e70b859f40fd 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -19,8 +19,8 @@ USE_GNOME= glib12
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
MAN5= pop3lite.conf.5
MAN8= pop3lite.8
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 7fd6438670ae..86ba1e7d404e 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -24,7 +24,8 @@ USE_PERL5= yes
PDM_MODULES= any master
CONFIGURE_ARGS= --without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/popular \
--enable-ssl --with-pdm="${PDM_MODULES}"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_RC_SUBR= pcheckd.sh pproxy.sh pserv.sh 0ringd.sh
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index 32ea6406da32..7439092c9ec3 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -29,9 +29,9 @@ WRKSRC= ${WRKDIR}/release-${PORTVERSION}
USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+= -I${LOCALBASE}/include
pre-configure:
@cd ${WRKSRC} && ${ACLOCAL}
diff --git a/mail/qsf/Makefile b/mail/qsf/Makefile
index 231909072fac..8387e0e8c7c2 100644
--- a/mail/qsf/Makefile
+++ b/mail/qsf/Makefile
@@ -20,13 +20,12 @@ OPTIONS= GDBM "GDBM support" off \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= qsf.1
PLIST_FILES= bin/qsf
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/mail/rabl_client/Makefile b/mail/rabl_client/Makefile
index 6a6426928e44..e00b2474c33c 100644
--- a/mail/rabl_client/Makefile
+++ b/mail/rabl_client/Makefile
@@ -16,7 +16,7 @@ COMMENT= Reactive Autonomous Blackhole List client
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--localstatedir=${VAR_DIR}
diff --git a/mail/rabl_server/Makefile b/mail/rabl_server/Makefile
index dc3dbc0c0193..c4ccd4f01aff 100644
--- a/mail/rabl_server/Makefile
+++ b/mail/rabl_server/Makefile
@@ -18,7 +18,7 @@ COMMENT= Reactive Autonomous Blackhole List server
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= CHANGE README RELEASE.NOTES
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index 659619b33c16..c7a7a8402ee7 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -17,8 +17,8 @@ PLIST_FILES= sbin/rmilter etc/rc.d/rmilter.sh etc/rmilter.conf.sample
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WITH_SENDMAIL_BASE= yes
diff --git a/mail/sccmilter/Makefile b/mail/sccmilter/Makefile
index e804d74ec148..35ef959f74e0 100644
--- a/mail/sccmilter/Makefile
+++ b/mail/sccmilter/Makefile
@@ -25,17 +25,14 @@ USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=/var
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN5= sccmilter.conf.5 scchosts.5 sccusers.5
MAN8= sccmilter.8
-CPPFLAGS= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --with-debug
diff --git a/mail/sendmail/bsd.milter.mk b/mail/sendmail/bsd.milter.mk
index b89f43053a84..277a01a4036e 100644
--- a/mail/sendmail/bsd.milter.mk
+++ b/mail/sendmail/bsd.milter.mk
@@ -93,14 +93,7 @@ MILTERLIB= -rpath=${MILTERRPATH}
.endif
.if !defined(WITHOUT_MILTER_LDFLAGS)
-.if defined(LDFLAGS)
LDFLAGS+=${MILTERLIB}
-.else
-LDFLAGS=${MILTERLIB}
-.endif
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-
# eof
diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile
index 269a7a3b5787..c8a8d7dcc78a 100644
--- a/mail/smtpmail/Makefile
+++ b/mail/smtpmail/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= mnag@FreeBSD.org
COMMENT= Tool to send e-mail via a remote smtp server
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= bin/smtpmail
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index d8bb78d5b799..8ceb16c9d18c 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -68,7 +68,6 @@ PORTDOCS= AUTHORS ChangeLog NEWS README TODO
USE_RC_SUBR= spamass-milter
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
SUB_FILES= pkg-message
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 960e7db19838..616f42c06e07 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -22,7 +22,6 @@ MAINTAINER= stefan@FreeBSD.org
COMMENT= Spam detector using Bayesian analysis of word counts
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-default-8bit
MAN1= spamprobe.1
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 7df3536704ca..0a826fdd0fec 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES= SF/courier/webmail/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= CGI Webmail client for Maildirs
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}" \
- CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}"
+CFLAGS:= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
+CXXFLAGS:= -I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base
RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 9225e945602f..8928ed784570 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -26,9 +26,9 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
# Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --enable-ipv6 \
--prefix=${PREFIX} \
--with-libintl-prefix=${LOCALBASE} \
diff --git a/math/GiNaC/Makefile b/math/GiNaC/Makefile
index d8d192121597..c5f6e996f2a9 100644
--- a/math/GiNaC/Makefile
+++ b/math/GiNaC/Makefile
@@ -22,14 +22,13 @@ USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= ginsh.1 viewgar.1
INFO= ginac ginac-examples
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/math/algae/Makefile b/math/algae/Makefile
index bb52f788dee0..6e0750bdf267 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -24,7 +24,7 @@ MAN1= algae.1
INFO= algae
USE_FORTRAN= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -L`${CAT} ${WRKSRC}/LIBDIR` -L${LOCALBASE}/lib"
+LDFLAGS+= -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -L`${CAT} ${WRKSRC}/LIBDIR` -L${LOCALBASE}/lib
FORTRANLIBS= gfortranbegin gfortran
post-patch:
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index bdb26481ab72..04b9d01f236c 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -50,10 +50,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-latex=${LOCALBASE}/share/texmf/tex/latex \
--with-context=${LOCALBASE}/share/texmf/tex/context/third
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include $${CPPFLAGS}" \
- LFLAGS="-L${LOCALBASE}/lib $${LFLAGS}" \
- CFLAGS="-I${LOCALBASE}/include $${CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS}"
+CONFIGURE_ENV= LFLAGS="-L${LOCALBASE}/lib $${LFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
MAKE_ENV+= ${CONFIGURE_ENV}
MKTEXLSR= ${LOCALBASE}/bin/mktexlsr
diff --git a/math/blas/Makefile b/math/blas/Makefile
index ae585e080897..20ac9ee40438 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES= lib/libblas.a lib/libblas.so lib/libblas.so.${SHLIB_MAJOR}
LDFLAGS+= ${FFLAGS}
LDADD ?= -lgfortran -lm
SRCCONF= ${NONEXISTENT}
-MAKE_ENV+= LDADD="${LDADD}" LDFLAGS="${LDFLAGS}" \
+MAKE_ENV+= LDADD="${LDADD}" \
SHLIB_MAJOR="${SHLIB_MAJOR}" SRCCONF="${SRCCONF}"
.for _u in AR NM RANLIB
MAKE_ENV+= ${_u}="${LOCALBASE}/bin/${_u:L}"
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index af6d549632fa..85ee5f78bc8c 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -35,7 +35,7 @@ CMAKE_USE_PTHREAD= yes
QT_COMPONENTS= corelib opengl qmake_build gui moc_build rcc_build
HAS_CONFIGURE= yes
DOCSDIR= ${PREFIX}/share/doc/CGAL-3.4
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= cgal_create_cmake_script.1
diff --git a/math/cln/Makefile b/math/cln/Makefile
index c377f05cc5f8..03f223cb54c5 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -23,9 +23,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gmp
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INFO= cln
@@ -34,8 +32,8 @@ MAN1= pi.1
STRIP= # none
CFLAGS+= -fPIC
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index 7918a55d2145..016762a03203 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -23,7 +23,6 @@ USE_DOS2UNIX= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= dieharder.1
MAN3= libdieharder.3
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index a83c8239bb3e..3895ba2ba53f 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -20,8 +20,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix intlhack libglade2
USE_GMAKE= yes
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|#!/bin/bash|#!/bin/sh|g' \
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index 3998a399ff15..cc1a009fe713 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES= lib/libeispack.a lib/libeispack.so lib/libeispack.so.${SHLIB_MAJOR}
LDFLAGS+= ${FFLAGS}
SRCCONF= ${NONEXISTENT}
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
+MAKE_ENV+= SHLIB_MAJOR="${SHLIB_MAJOR}" \
SRCCONF="${SRCCONF}"
OPTIONS= PROFILE "Build and install a profiling library" Off
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 29cb41f99713..da05024549d6 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -27,8 +27,8 @@ USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-threads
-CONFIGURE_ENV= CPPLAGS="${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(FFTW3_FLAVOR) && ${FFTW3_FLAVOR}=="default"
MAN1= fftw-wisdom-to-conf.1 fftw-wisdom.1
@@ -43,7 +43,7 @@ OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off
.include <bsd.port.pre.mk>
.if defined(WITH_OPTIMIZED_CFLAGS)
-CONFIGURE_ENV+= CFLAGS="${CFLAGS:N-O:N-O*} -O2 -ffast-math -fomit-frame-pointer"
+CFLAGS:= ${CFLAGS:N-O:N-O*} -O2 -ffast-math -fomit-frame-pointer
.if ${FFTW3_FLAVOR}=="default" && ${MACHINE_CPU:Msse}
# !!Detect SSE and not SSE2!!
CONFIGURE_ARGS+=--enable-sse2
@@ -61,7 +61,7 @@ CFLAGS_3DNOW= ${CFLAGS:N-O:N-O*} -O3 -fomit-frame-pointer -fno-schedule-insns \
.if ${ARCH} != "amd64"
CFLAGS_3DNOW+= -malign-double
.endif
-CONFIGURE_ENV+= CFLAGS="${CFLAGS_3DNOW}"
+CFLAGS+= ${CFLAGS_3DNOW}
.endif
.endif # end WITH_OPTIMIZED_CFLAGS
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 1b7daf2bd609..888e3a2b2820 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -31,7 +31,6 @@ USE_WX= 2.8+
WX_CONF_ARGS= absolute
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-doc --disable-xyconvert
USE_LDCONFIG= yes
@@ -39,9 +38,9 @@ MAN1= fityk.1 xyconv.1
PORTDOCS= *
CFLAGS+= -D_GNU_SOURCE
-CPPFLAGS= -I${WRKDIR}/${XYLIB_DISTNAME} \
+CPPFLAGS+= -I${WRKDIR}/${XYLIB_DISTNAME} \
-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
+LDFLAGS+= -L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
-L${LOCALBASE}/lib ${PTHREAD_LIBS}
XYLIB_DISTNAME= xylib-0.6
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 8e3f82539856..1fd0a783a65f 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -39,7 +39,7 @@ USE_QT_VER= 4
USE_CMAKE= yes
QT_COMPONENTS= gui network opengl moc_build rcc_build uic_build \
qmake_build xml svg
-CPPFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include ${AMDINC}
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include ${AMDINC}
SLAVEDIRS= math/freemat-mpi
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index ae62dc89af44..3e6830553ccf 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -18,7 +18,7 @@ USE_GL= glut
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
pre-configure:
@${REINPLACE_CMD} -e 's|-O2|-fPIC|g; s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index fcae29fe5757..06a9b36f5ec4 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -18,8 +18,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= libglade2
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
MAN1= galculator.1
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index bcb1c726487e..75b9bcafbe96 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -18,12 +18,11 @@ USE_GNOME= gtk20
WANT_UNICODE= yes
USE_WX= 2.6+
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
USE_LDCONFIG= yes
-CPPFLAGS= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == ""
CFLAGS+= -O2 -fno-strict-aliasing
.endif
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 874fe82d50f4..d89083ead85f 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils gtk20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gcalctool.1
GLIB_SCHEMAS= org.gnome.gcalctool.gschema.xml
diff --git a/math/geg/Makefile b/math/geg/Makefile
index a48e80035177..e23e7ad2ddde 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -19,8 +19,8 @@ COMMENT= Visualise multiple 2D-functions of one variable
USE_GNOME= gtk12
USE_AUTOTOOLS= automake autoconf
AUTOMAKE_ARGS= -a -i
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= geg.1
PLIST_FILES= bin/geg
diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile
index ae2b2983696b..8ef3eb44c34d 100644
--- a/math/gexpr/Makefile
+++ b/math/gexpr/Makefile
@@ -16,9 +16,6 @@ MASTER_SITE_SUBDIR= apps/math/calc
MAINTAINER= ports@FreeBSD.org
COMMENT= A shell calculator
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-
MAN1= gexpr.1
PLIST_FILES= bin/gexpr
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index 1ac3f375a2a1..898f0b66e6f3 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -46,8 +46,6 @@ CONFIGURE_ARGS= --disable-pari
CXXFLAGS+= -DSMARTPTR64 -D_I386_ -fPIC
.endif
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
WRKSRC= ${WRKDIR}/giac-${PORTVERSION}
FLTKDEV-GIAC= ${WRKDIR}/fltk-1.3.x-r6916
COCOALIB-GIAC= ${WRKDIR}/CoCoALib-0.9937
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index dbddfb48407c..99e725888c61 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -27,7 +27,6 @@ USE_LDCONFIG= yes
CFLAGS+= -trigraphs
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --with-gmp --with-zlib
.include <bsd.port.pre.mk>
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 5a314ec8725d..1b0935e6bbe1 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -39,7 +39,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gnome --disable-silent-rules
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
python_prog=${PYTHON_VERSION}
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
MAKE_JOBS_SAFE= yes
GLIB_SCHEMAS= org.gnome.gnumeric.dialogs.gschema.xml \
diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 00aac906486c..0e90e9171c9e 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+= VERSION=${PORTVERSION:R}
CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/ \
-I${LOCALBASE}/include/tk${TK_VER} ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -ltcl${USE_TCL} -ltk${USE_TK} ${PTHREAD_LIBS}
+LDFLAGS+= -L${LOCALBASE}/lib -ltcl${USE_TCL} -ltk${USE_TK} ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index 4b8138ed6b4f..5f3ac7fecab7 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -25,13 +25,12 @@ USE_GMAKE= yes
USE_WX= 2.6
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKEFILE= GNUmakefile
PLIST_FILES= bin/graphthing bin/gt
-CPPFLAGS= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/graphthing ${PREFIX}/bin
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index ca41c642400d..d75efd05662c 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -28,8 +28,7 @@ ALL_TARGET= # empty
CONFIGURE_ARGS = --enable-static --enable-shared --with-gmake --without-gnome
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LAPACK_LIBS="${LAPACK} ${BLAS}" \
- LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LAPACK_LIBS="${LAPACK} ${BLAS}"
MAN1= gretl.1
OPTIONS= ATLAS "Use Atlas for BLAS and LAPACK" off \
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 585d3f54f7b7..f1c9199d58ef 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -26,9 +26,9 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gnumeric --enable-explicit-python-linking
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libglade-1.0" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
GNUMERIC_IDLDIR="${WRKDIR}/gnumeric"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libglade-1.0
PLIST_SUB= VERSION="${PORTVERSION}"
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/math/jags/Makefile b/math/jags/Makefile
index c090fb1aefac..748cf50e7900 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -34,7 +34,6 @@ WRKSRC= ${WRKDIR}/${PKGNAME:S/mcmc-//:U}
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_FORTRAN= yes
USE_LDCONFIG= yes
USE_BISON= build
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index b7fefd157d0f..fee85831e65a 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -31,8 +31,8 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS+=--enable-system-qwtplot3d=yes --enable-system-liborigin=yes \
--enable-ocaml=no --enable-fftw=no
diff --git a/math/lapacke/Makefile b/math/lapacke/Makefile
index 80284cc12750..acc4f60ffce6 100644
--- a/math/lapacke/Makefile
+++ b/math/lapacke/Makefile
@@ -52,7 +52,7 @@ LAPACK= -lpthread -lalapack_r
LDFLAGS+= -L${LOCALBASE}/lib -lgfortran -lgcc_s
LDADD?= -lgfortran -lgcc_s
-MAKE_ENV= LDADD="${LDADD}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= LDADD="${LDADD}"
.if defined(WITHOUT_LAPACK_LATEST)
MAKE_ENV+= WITHOUT_LAPACK_LATEST=yes
.endif
diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index 01c16baf5b5c..4d76f8ae0a91 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -50,7 +50,7 @@ LAPACK= -lalapack_r
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
SRCCONF= ${NONEXISTENT}
-MAKE_ENV= LDADD="${LAPACK} ${BLAS}" LDFLAGS="${LDFLAGS}" \
+MAKE_ENV= LDADD="${LAPACK} ${BLAS}" \
SRCCONF="${SRCCONF}"
.if !defined(NOPORTDOCS)
diff --git a/math/lrng/Makefile b/math/lrng/Makefile
index c9dc75966522..8dc7ad52eabe 100644
--- a/math/lrng/Makefile
+++ b/math/lrng/Makefile
@@ -29,7 +29,7 @@ LICENSE= GPLv3
CLEANFILES= ${SRCS}
LIB= ${PORTNAME}
LIBDIR = ${PREFIX}/lib
-MAKE_ENV+= CLEANFILES="${CLEANFILES}" LDFLAGS="${LDFLAGS}" \
+MAKE_ENV+= CLEANFILES="${CLEANFILES}" \
LIB="${LIB}" LIBDIR="${LIBDIR}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
SRCS="${SRCS}" SRCCONF="${SRCCONF}"
NO_WRKSUBDIR= yes
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index 6aee0ef06a6c..a608c2f02768 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GMAKE= yes
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ECM=1
+MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" ECM=1
HEADERS= mp.h msieve.h util.h
PLIST_FILES= bin/msieve lib/libmsieve.a ${HEADERS:S|^|include/msieve/|}
diff --git a/math/mtrxmath/Makefile b/math/mtrxmath/Makefile
index b3549951b2c9..00f691cacdbf 100644
--- a/math/mtrxmath/Makefile
+++ b/math/mtrxmath/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES= http://www.angelfire.com/linux/linuxjeff/mtrxmath/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= A small tool for matrix mathemetics
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
PORTDOCS= README
PLIST_FILES= bin/mtrxmath
diff --git a/math/ndiff/Makefile b/math/ndiff/Makefile
index 90bc5e4084ae..37c74c07f1fc 100644
--- a/math/ndiff/Makefile
+++ b/math/ndiff/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gmp
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.else
.if ${ARCH} == sparc64
CONFIGURE_ARGS= --with-long-double
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index 073eb062a46a..d7a3225aee1b 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -73,16 +73,15 @@ OCTAVE_VERSION= ${PORTVERSION}
GNU_HOST= ${ARCH}-portbld-freebsd${OSREL}
PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/metis
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= ${INCLUDES}
CXXFLAGS+= ${INCLUDES}
CPPFLAGS+= ${INCLUDES}
CONFIGURE_ENV+= GPERF="${LOCALBASE}/bin/gperf" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
CC="${CC}" \
CXX="${CXX}" \
TERMIOS_H="termios.h"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --host=${GNU_HOST} \
--with-blas="-L${LOCALBASE}/lib ${BLAS}" \
--with-lapack="${LAPACK}" \
diff --git a/math/octave/Makefile b/math/octave/Makefile
index f498a030d271..0e052897a58c 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -77,16 +77,15 @@ OCTAVE_VERSION= ${PORTVERSION}
GNU_HOST= ${ARCH}-portbld-freebsd${OSREL}
PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
INCLUDES= -I${LOCALBASE}/include
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS} ${INCLUDES}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= ${INCLUDES}
CXXFLAGS+= ${INCLUDES}
CPPFLAGS+= ${INCLUDES}
CONFIGURE_ENV+= GPERF="${LOCALBASE}/bin/gperf" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
CC="${CC}" \
CXX="${CXX}" \
MAKEINFO=${PREFIX}/bin/makeinfo
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --host=${GNU_HOST} \
--with-blas="-L${LOCALBASE}/lib ${BLAS}" \
--with-lapack="${LAPACK}" \
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 46036b6c6093..c1c935fe9c99 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -18,8 +18,8 @@ COMMENT= The GNU spreadsheet for X11 and terminals
USE_PERL5_BUILD= yes
USE_BISON= build
USE_AUTOTOOLS= autoconf213
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot
INFO= oleo
diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index 92f63f80c61c..fa5704352f81 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/orpie bin/orpie-curses-keys etc/orpierc
diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile
index d0cde38f0301..079eb3db9809 100644
--- a/math/pgcalc/Makefile
+++ b/math/pgcalc/Makefile
@@ -19,8 +19,8 @@ USE_KDELIBS_VER= 3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= ARTS "Build with aRts support" on
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 6ce9457c3f76..28ddc9875d63 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -27,9 +27,9 @@ USE_CMAKE= yes
USE_PERL5_BUILD=yes
USE_GNOME= pango
USE_GHOSTSCRIPT=yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- WITH_FREETYPE=ON
+CONFIGURE_ENV+= WITH_FREETYPE=ON
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CMAKE_ARGS+= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
-DENABLE_ada:BOOL=OFF -DENABLE_d:BOOL=OFF \
-DPLD_plmeta=ON
diff --git a/math/prng/Makefile b/math/prng/Makefile
index 4b252393fbdc..e2d70b7d36d6 100644
--- a/math/prng/Makefile
+++ b/math/prng/Makefile
@@ -15,7 +15,6 @@ LICENSE= GPLv2
CFLAGS+= -fgnu89-inline
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
INFO= prng
PLIST_FILES= include/prng.h lib/libprng.a
PORTDOCS= prng.dvi prng.pdf prng.ps prng.txt
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 225ae0a2c8e7..492661ec09b0 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -26,12 +26,11 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INFO= pspp pspp-dev
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index c1dccd30e641..b67560a6c0a8 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -75,6 +75,8 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
+# ignore LDFLAGS from env, as it overrides internal flags (e.g. -shared) for some reason
+ @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" ${WRKSRC}/numpy/distutils/fcompiler/__init__.py
GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
pre-configure:
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index 30b2c2c4a905..40da72a8e3ec 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
USE_PYTHON= yes
USE_PYDISTUTILS= yes
LDFLAGS+= -L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
post-patch:
@${REINPLACE_CMD} -e 's,^statichere ,,' ${WRKSRC}/src/rpymodule.c
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 4d7a0f58cac8..8f0f1c808c38 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -34,8 +34,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS = --with-gfortran
CONFIGURE_ENV= ac_cv_search_pthread_join="${PTHREAD_LIBS}" \
- BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}" \
- LDFLAGS="${LDFLAGS}"
+ BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
OPTIONS= ATLAS "Use Atlas instead of Blas" OFF \
FFTW "Use FFTW" ON \
diff --git a/math/sdpa-gmp/Makefile b/math/sdpa-gmp/Makefile
index 80dd0abd5472..acf7fe49857e 100644
--- a/math/sdpa-gmp/Makefile
+++ b/math/sdpa-gmp/Makefile
@@ -30,7 +30,10 @@ LIB_DEPENDS+= spooles:${PORTSDIR}/math/spooles \
mpfr.4:${PORTSDIR}/math/mpfr
CONFIGURE_ARGS+= --with-system-spooles
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles
+CXXFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/spooles
PLIST_SUB+= MANUALFILE=${MANUALFILE}
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 0c594964a053..435a2d46d17f 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_XORG= x11 xmu
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-cups --datadir=${PREFIX}/share
CONFLICTS= surf-0* # www/surf
diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index 060cb3a36be6..869a3a9995b3 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -25,9 +25,10 @@ USE_GNOME= libxml2
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib \
- LDFLAGS=-L${PREFIX}/lib \
- PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
+CONFIGURE_ENV= LIBS=-L${PREFIX}/lib \
+ PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
MAN1= tablix2.1 tablix2_benchmark.1 tablix2_kernel.1 tablix2_output.1 \
tablix2_plot.1 tablix2_test.1
diff --git a/math/testu01/Makefile b/math/testu01/Makefile
index b19576fc87c9..f20a23f492f5 100644
--- a/math/testu01/Makefile
+++ b/math/testu01/Makefile
@@ -26,7 +26,6 @@ USE_GMAKE= yes
MAKE_ARGS= docdir="${DOCSDIR}" exdir="${EXAMPLESDIR}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
CFLAGS+= -fPIC
PLIST_SUB= PORTNAME="${PORTNAME}"
diff --git a/math/unuran/Makefile b/math/unuran/Makefile
index 4bfa3897d081..fa247ad1ca38 100644
--- a/math/unuran/Makefile
+++ b/math/unuran/Makefile
@@ -23,7 +23,6 @@ CONFIGURE_ARGS= --enable-shared --with-urng-rngstream --with-urng-default=rngstr
--enable-info
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_ENV= MAKE="${GMAKE}"
USE_LDCONFIG= yes
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index 2461dd361ba3..cabcd1d5a1d2 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -18,8 +18,8 @@ COMMENT= A spreadsheet program for X and terminals
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= xspread.1 pxspread.1
diff --git a/misc/cdcollect/Makefile b/misc/cdcollect/Makefile
index d689757819b2..de118d4a449b 100644
--- a/misc/cdcollect/Makefile
+++ b/misc/cdcollect/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnome gnomesharp20
GCONF_SCHEMAS= cdcollect.schemas
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
${REINPLACE_CMD} -e 's,SqliteClient,Sqlite,' \
diff --git a/misc/demoniac/Makefile b/misc/demoniac/Makefile
index 8d4d7da77f0d..72c7fcb0b942 100644
--- a/misc/demoniac/Makefile
+++ b/misc/demoniac/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_GL= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
- LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
PLIST_FILES= bin/demoniac share/demoniac/pixmaps/logo.xpm
PLIST_DIRS= share/demoniac/pixmaps share/demoniac
diff --git a/misc/display/Makefile b/misc/display/Makefile
index d8d923d47c94..2ce4709a7de2 100644
--- a/misc/display/Makefile
+++ b/misc/display/Makefile
@@ -28,7 +28,7 @@ CONFLICTS= ImageMagick-[0-9]* goblin-*
.endif
CONFIGURE_ARGS+= --program-prefix=${DISPLAY_PROGRAM_PREFIX}
-CONFIGURE_ENV+= LDFLAGS="${STRIP}"
+LDFLAGS+= ${STRIP}
MAN1= ${DISPLAY_PROGRAM_PREFIX}display.1
PLIST_FILES= bin/${DISPLAY_PROGRAM_PREFIX}display
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index fa0391cc5358..54b833f4fc77 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -19,8 +19,8 @@ COMMENT= The GNU find utilities
SIG_FILES= ${DISTNAME}${EXTRACT_SUFX}.sig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index bd4df4baafdc..a97dc61a277c 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-MAKE_ENV= LIBCGETOPT=0 LDFLAGS="${LDFLAGS}"
+MAKE_ENV= LIBCGETOPT=0
MAN1= getopt.1
DOCS= Changelog README
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index 95e7f63f08ed..edce4e7ed480 100644
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack intlhack gtk20
INSTALLS_ICONS= 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/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index f300e4ff1330..3933a9d68f45 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack intlhack gtk20
INSTALLS_ICONS= 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/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 12d033ff684d..f2ae701a85aa 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -21,8 +21,8 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 9b3b3975f276..35ec178e1325 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -18,14 +18,13 @@ USE_GNOME= gnomehack gnomeprefix intlhack pygnome2
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
GCONF_SCHEMAS= gnome-osd.schemas
MAN1= gnome-osd-client.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
.if !defined(NOPORTDOCS)
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 54041edd7102..b28c9eb4255c 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_GNOME= gnomeprefix libgnomeui
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/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index 1f2e8d880324..836d4a43c79e 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS= plaympeg:${PORTSDIR}/multimedia/smpeg
USE_BZIP2= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gtktalog.1
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index a3c341f628ef..9ad29c4a3c3d 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -25,8 +25,6 @@ USE_GETTEXT= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index a62fd1ca48dc..82dffad6732f 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -20,8 +20,8 @@ USE_GETTEXT= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
MAN1= kcd.1
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 50de493d65ae..24a91120d46f 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -26,7 +26,8 @@ USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
# sound version
SOUNDV= 0.3.9
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 0ff57e44a9c3..8214f604e262 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -24,7 +24,7 @@ USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
# does not work now
#.if defined(WITHOUT_NLS)
#CONFIGURE_ARGS+=--disable-nls
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 64aee125f1b3..e75c679da0e3 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -52,7 +52,7 @@ PLIST_SUB+= NLS="@comment "
.endif
.if defined(WITH_MC_IN_MC)
-CONFIGURE_ENV+= CPPFLAGS=-DMC_IN_MC_ALLOWED
+CPPFLAGS+= -DMC_IN_MC_ALLOWED
.endif
post-install:
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index e127e285bcb0..24245cf37ef7 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -61,7 +61,8 @@ PLIST_SUB= CHARSETS="@comment "
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
_MANLANG= es hu it pl ru sr
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 68c8936d8d1c..ff4d28bc222c 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -25,9 +25,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= glib20
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= AWK="${AWK}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV+= AWK="${AWK}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
# Documents to install
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 4d542cad1511..f63b7f9b6eb9 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -18,7 +18,7 @@ COMMENT= A GNOME application designed to manage cyclic tasks
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/misc/pinfo/Makefile b/misc/pinfo/Makefile
index bf3daee5fd5d..60f434444a7f 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Ncurses based, lynx style info documentation browser
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-readline \
--with-localedir=${PREFIX}/share/locale
diff --git a/misc/podsleuth/Makefile b/misc/podsleuth/Makefile
index 20cc6220a821..0178d28e21cb 100644
--- a/misc/podsleuth/Makefile
+++ b/misc/podsleuth/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono \
${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
CONFIGURE_ARGS+=--with-hal-callouts-dir=${PREFIX}/libexec
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 9e5eede931dd..6cdce6b2436e 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -21,8 +21,8 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= quick-lounge.schemas
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 33a409b67519..56944c218531 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib20 libxml2 intltool gnomehack intlhack
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
MAN1= update-mime-database.1
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 9b36a1693c88..16dd88b21514 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -28,11 +28,10 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= automake:env
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS/s| desktop-links docs | |' \
diff --git a/misc/toilet/Makefile b/misc/toilet/Makefile
index 7ee41ba7bb65..d2407fbf414e 100644
--- a/misc/toilet/Makefile
+++ b/misc/toilet/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= caca.0:${PORTSDIR}/graphics/libcaca
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=""
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -fno-strength-reduce
MAN1= ${PORTNAME}.1
PORT_VERBS= ${PORTNAME} caca2tlf share/figlet/*tlf
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 837e5c88a95f..374758782083 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -17,8 +17,8 @@ COMMENT= A gTK+ viewer for the User Friendly and several other popular comics
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop libgnomeui
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
pre-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index 9018f80b87c5..e012c4b233a5 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -26,8 +26,8 @@ MAKE_ARGS= CC="${CC}" \
INCDIR="`pkg-config --cflags gtk+-2.0` -I${LOCALBASE}/include" \
LIBDIR="" \
LIBS="-lical -lXpm"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= wmCalendar.1
PLIST_FILES= bin/wmCalendar
diff --git a/misc/wmpal/Makefile b/misc/wmpal/Makefile
index 0a2dcfd95c8f..a60b23906ad6 100644
--- a/misc/wmpal/Makefile
+++ b/misc/wmpal/Makefile
@@ -15,8 +15,8 @@ COMMENT= A one of the most useless dockapps in the world
USE_XORG= xpm
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= README
PLIST_FILES= bin/wmpal
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index b4f2183b4ce9..231d64e35712 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USE_XORG= xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= wmwork.1
PLIST_FILES= bin/wmwork
diff --git a/misc/xbiso/Makefile b/misc/xbiso/Makefile
index 03649e5984ff..8405ac312d25 100644
--- a/misc/xbiso/Makefile
+++ b/misc/xbiso/Makefile
@@ -17,8 +17,8 @@ COMMENT= XBox xdvdfs iso extraction utility
LIB_DEPENDS= ftp.3:${PORTSDIR}/ftp/ftplib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/xbiso
diff --git a/misc/xsw/Makefile b/misc/xsw/Makefile
index ce553b44b33d..1d2a4f3d45b8 100644
--- a/misc/xsw/Makefile
+++ b/misc/xsw/Makefile
@@ -21,8 +21,8 @@ USE_SDL= sdl ttf image gfx
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPLAGS="${CPPPLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if !defined(NO_INSTALL_MANPAGES)
MAN1= xsw.1 \
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 041259eb5e76..6b2366af630d 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -50,8 +50,6 @@ CFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/wx-2.8 \
-L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
INSTALLS_ICONS= yes
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 2f230acbe538..f1715a5729cb 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
- CFLAGS="-I${LOCALBASE}/include" \
- CPP=${CPP}
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --disable-evdevplug --disable-alsa \
--disable-pulse --disable-projectm-1.0
WANT_GNOME= yes
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index c237f57023db..6fda908ac325 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE= yes
USE_XORG= x11 sm
USE_GNOME= gtk20 libglade2
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= audacious.1 audtool.1
diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile
index 436218cb39f5..a4faa8a90d55 100644
--- a/multimedia/audiopreview/Makefile
+++ b/multimedia/audiopreview/Makefile
@@ -17,8 +17,8 @@ USE_GMAKE= yes
USE_GSTREAMER= core
USE_GNOME= intltool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= bin/audiopreview
MAN1= audiopreview.1
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 28f761e96d99..329ba21aa711 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -27,9 +27,9 @@ USE_ICONV= yes
USE_LDCONFIG= yes
LIBTOOLFILES= configure ffmpeg/configure
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \
--disable-v4l \
--disable-divx4
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 405359dc7da1..c5fbef9af8ba 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -23,11 +23,11 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lstdc++" \
- INPUT_PLUGINS="${INPUT_PLUGINS}" \
+CONFIGURE_ENV= INPUT_PLUGINS="${INPUT_PLUGINS}" \
OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lstdc++
MAN1= beep-media-player.1
INPUT_PLUGINS= cdaudio,mpg123,wav
diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile
index 2a3e5530a31e..d5b4f1dcfebf 100644
--- a/multimedia/bmp-extra-plugins/Makefile
+++ b/multimedia/bmp-extra-plugins/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} \
--with-vorbis=${LOCALBASE}
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g ; \
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 1dfc34943ba0..f49d2f63ca91 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -24,11 +24,11 @@ ONLY_FOR_ARCHS= i386 alpha
USE_AUTOTOOLS= autoconf libtool libltdl
USE_EFL= imlib2
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \
+CPPFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/gtk12 \
-I${LOCALBASE}/include/gdk-pixbuf-1.0 \
- -I${LOCALBASE}/include/glib12" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ -I${LOCALBASE}/include/glib12
+LDFLAGS+= -L${LOCALBASE}/lib
.if exists(/usr/include/dev/bktr/ioctl_bt848.h)
post-patch:
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 779ce3184c50..56c506443749 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -31,8 +31,8 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCS= AUTHORS COPYING ChangeLog NEWS README
GCONF_SCHEMAS= cheese.schemas
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index e09283b10f9d..3b915db3c849 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -22,7 +22,6 @@ USE_GNOME= gnomehack ltverhack gnomeprefix
USE_GSTREAMER= yes
USE_XORG= xp x11
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index fb44046829b4..8f9dab5d6366 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -21,8 +21,8 @@ MAKE_JOBS_SAFE= yes
USE_GNOME= pkgconfig gnomehack
USE_LDCONFIG= yes
-CONFIGURE_ENV?= CPPFLAGS=-I${LOCALBASE}/include \
- HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \
+CONFIGURE_ENV?= HAVE_LATEX=${FALSE} HAVE_DVIPDFM=${FALSE} \
HAVE_DOXYGEN=${FALSE} HAVE_DOT=${FALSE}
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/multimedia/dvbsnoop/Makefile b/multimedia/dvbsnoop/Makefile
index cef7d66d2a4c..8a04e39db4d2 100644
--- a/multimedia/dvbsnoop/Makefile
+++ b/multimedia/dvbsnoop/Makefile
@@ -16,7 +16,7 @@ COMMENT= DVB stream analyzer / MPEG analyzer
DVB_HEADERS= dmx.h frontend.h
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${WRKSRC}"
+CFLAGS+= -I${WRKSRC}
USE_GMAKE= yes
PLIST_FILES= bin/${PORTNAME}
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 687c2c071c75..cb26614dc0f5 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -22,7 +22,7 @@ USE_BISON= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/dvdauthor
MAN1= dvdauthor.1 dvddirdel.1 dvdunauthor.1 mpeg2desc.1 spumux.1 spuunmux.1
@@ -40,7 +40,7 @@ WITH_IMAGEMAGICK= yes
.if defined(WITH_ICONV)
USE_ICONV= yes
-CFLAGS+= "-DICONV_CONV=yes"
+CFLAGS+= -DICONV_CONV=yes
.endif
.if defined(WITH_IMAGEMAGICK)
LIB_DEPENDS+= MagickWand.4:${PORTSDIR}/graphics/ImageMagick
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 2982b6970f33..fc849b087371 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -41,7 +41,7 @@ USE_GETTEXT= yes
USE_CDRTOOLS= yes # dvdstyler needs mkisofs
GNU_CONFIGURE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN1= dvdstyler.1
.include <bsd.port.pre.mk>
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 06523dd30359..a4f61e461317 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= png:${PORTSDIR}/graphics/png \
swscale:${PORTSDIR}/multimedia/ffmpeg \
jpeg.11:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
GNU_CONFIGURE= yes
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index ebd501db6fb8..d1ee2157ddc8 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= pkgconfig gnomehack
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-cpuflags --without-doxygen
PORTDOCS= README
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 27bafe048938..ee664bcc13a6 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder
RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 802ec656f5e0..4c47ef7e4276 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -42,12 +42,11 @@ OPTIONS= GMERLIN "Enable gmerlin support" on \
USE_GNOME= gnomehack pkgconfig
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-cpuflags --without-doxygen
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 038ddc91d697..a23ffa98501c 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -40,15 +40,14 @@ USE_XORG= ice x11 xinerama xv
USE_GL= gl
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-alsa --disable-v4l --disable-v4l2 \
--disable-camelot --disable-alsamixer --disable-v4lconvert \
--without-doxygen --without-cpuflags
USE_LDCONFIG= yes
INSTALL_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= gmerlin
MAN1= gmerlin_play.1
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 58c5b639076f..4b9a9b277e3f 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -31,8 +31,8 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= glib20 gtk20
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --without-alsa
MAN1= ${PORTNAME}.1
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index d1038b05003c..96a10ec12b79 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gtksharp20 gnomesharp20 gnomedocutils
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-subtitles.schemas
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 9930b08c6a0f..e2da83e61dda 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -22,11 +22,10 @@ LIB_DEPENDS= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
USE_GNOME= gtk12 intlhack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-sdl
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/multimedia/gst123/Makefile b/multimedia/gst123/Makefile
index 7ef9de2d101f..73d9bcfe7b38 100644
--- a/multimedia/gst123/Makefile
+++ b/multimedia/gst123/Makefile
@@ -20,7 +20,8 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gtk20
USE_GSTREAMER= good
-CONFIGURE_ENV= NCURSES5_CONFIG=/usr/bin/true LDFLAGS=-lncurses
+CONFIGURE_ENV= NCURSES5_CONFIG=/usr/bin/true
+LDFLAGS+= -lncurses
PLIST_FILES= bin/${PORTNAME}
MAN1= ${PORTNAME}.1
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index ac0e488c3fae..4dc1b30dde08 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -26,9 +26,10 @@ USE_LDCONFIG= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--with-ffmpeg-extra-configure=--cc=${CC}"
-CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
- CFLAGS="${CFLAGS} -fno-force-addr" \
- LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic"
+CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG}
+
+LDFLAGS+= -Wl,-Bsymbolic
+CFLAGS+= -fno-force-addr
PLIST_SUB= \
VERSION="${GST_VERSION}"
WITHOUT_CPU_CFLAGS= yes
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 7d82d2a579b6..e59aab49f5c6 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -53,9 +53,9 @@ USE_AUTOTOOLS= libtool
GST_PLUGIN?= base
CONFIGURE_ARGS= --disable-option-checking
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}
+CFLAGS+= -I${LOCALBASE}/include
DEFAULT_AUDIOSINK?= osssink
DEFAULT_AUDIOSRC?= osssrc
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index d1dfb327b5d6..dd46e968fd39 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -34,11 +34,8 @@ PLIST_SUB= VERSION="${GST_VERSION}"
GST_VERSION=${PORTVERSION:C/..$//}
-CMAKE_ARGS+= \
- -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include" \
- -DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \
- -DCMAKE_MODULE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \
- -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
+CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 1d2a0b559d6f..dcac257de455 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -32,9 +32,9 @@ CONFIGURE_ARGS= --disable-tests \
--disable-examples \
--disable-failing-tests \
--disable-gtk-doc
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- ac_cv_func_register_printf_function="no" \
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= ac_cv_func_register_printf_function="no" \
FLEX_PATH="${LOCALBASE}/bin/flex"
PLIST_SUB= VERSION="${GST_VERSION}"
USE_LDCONFIG= yes
diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile
index 0fb4fdbafbb1..9e0c58573682 100644
--- a/multimedia/gtk-recordmydesktop/Makefile
+++ b/multimedia/gtk-recordmydesktop/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/recordmydesktop:${PORTSDIR}/multimedia/recordmydes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_PYTHON= yes
USE_GNOME= gtk20 pygtk2 desktopfileutils
INSTALL_ICONS= yes
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index c7f118f84a4f..f6acb257acb0 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 2d412c7550aa..009a51900fb7 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_WEBPLUGINS= native
WEBPLUGINS_FILES=kaffeineplugin.so
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_AUTOTOOLS= libtool
.include <bsd.port.pre.mk>
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index efaf2e039916..ee0c5d724706 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -30,11 +30,11 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libglade2 libxml2
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt \
- -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib/libquicktime \
- -L${LOCALBASE}/lib" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include/lqt \
+ -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib/libquicktime \
+ -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-dv1394
MAN1= kino.1 kino2raw.1
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index 9b2165a965e0..6edff8440806 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -28,7 +28,7 @@ MAN1= kissdx.1
USE_RC_SUBR= kissdx
# set enviroment variables for port makefile
-MAKE_ENV= FreeBSD=defined LDFLAGS="${LDFLAGS}"
+MAKE_ENV= FreeBSD=defined
# Convert CR/LF to LF in source files
USE_DOS2UNIX= yes
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index d0077accc6e5..1c1e62598263 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -21,9 +21,9 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-gtk
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig
+CONFIGURE_ENV= PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_LDCONFIG= yes
MAN1= dubdv.1 dvconnect.1 encodedv.1
@@ -39,7 +39,7 @@ OPTIONS+= SDL "Add SDL support" off
# Optimizations -O{1,s,2,3} work
# However, lack of -O{1,s,2,3} or -O0 BREAK the build
# Therefore, make sure we have AT LEAST -O and avoid -O0
-CONFIGURE_ENV+= CFLAGS="-O ${CFLAGS:N-O0}"
+CFLAGS:= -O ${CFLAGS:N-O0}
.if defined(WITH_SDL)
USE_SDL= sdl
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index e568eda039a4..bf222b0656fa 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-dvdread-tree=${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index f38f4016d3bb..c270ffa6f2cf 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -33,8 +33,8 @@ BIN_FILES= mpeg3cat mpeg3dump mpeg3peek mpeg3toc
INC_FILES= libmpeg3.h mpeg3private.h mpeg3protos.h
LIB_FILES= libmpeg3.a
-CPPFLAGS= -I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS}
-LDFLAGS= -lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS}
+CPPFLAGS+= -I. -I${LOCALBASE}/include/a52dec ${PTHREAD_CFLAGS}
+LDFLAGS+= -lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS}
NASM?= ${LOCALBASE}/bin/nasm
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 5bda57804482..0ff585c9129c 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= autoconf
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
CFLAGS+= -fPIC
.if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index e09d52540247..0c44633450ff 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -22,9 +22,9 @@ USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= ltverhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="${PTHEAD_LIBS}"
+CONFIGURE_ENV= LIBS="${PTHEAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-sdltest \
--enable-shared \
--disable-examples
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index f2ba5878dccb..b6d738ecd97d 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -25,7 +25,6 @@ USE_GL= gl
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize
ACLOCAL_ARGS= -I.
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --program-prefix=va
USE_LDCONFIG= yes
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index ec36720bac03..3211c2d9242b 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -51,12 +51,12 @@ USE_GL= gl glu
USE_PERL5_BUILD=yes
USE_SDL= sdl
USE_LDCONFIG= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg" \
- CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
THREAD_LIBS="${PTHREAD_LIBS}" \
EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg
CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \
--enable-ipv6 \
--with-external-libmad \
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 81d95875cde1..dd27151ffbf0 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -53,11 +53,10 @@ USE_GHOSTSCRIPT_RUN= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-ldvgrab
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
OMC/lives-OMC.txt \
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index b5491b9253df..39d4c199ee89 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -17,7 +17,8 @@ COMMENT= Print information about the contents and structure of a DVD
LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= lsdvd.1
PLIST_FILES= bin/lsdvd
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index c62ee70954b3..82eba65c57c2 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -44,7 +44,6 @@ LXDVDRIPSRC= cputest.c \
vaporize.c
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -ldvdread -lm
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
PORTDOCS= Changelog.de Changelog.en Changelog.fr \
README.de README.en README.fr \
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index d0d9c694adbb..3cac9fb301ba 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -46,7 +46,7 @@ INSTALLS_EGGINFO= yes
MANCOMPRESSED= yes
MAN1= miro.1 miro.real.1
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
.include <bsd.port.pre.mk>
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index b1e1f0ed42f7..07adb796a520 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -30,8 +30,7 @@ WANT_GNOME= yes
WANT_SDL= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
CONFIGURE_ARGS= --without-x
@@ -50,8 +49,8 @@ DOC_FILES= AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README \
README.DV README.avilib README.glav README.AltiVec \
README.lavpipe README.transist TODO
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 065ccd4ba690..a00d946c2742 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -32,8 +32,7 @@ USE_RAKE= yes
USE_RUBY= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- ac_cv_path_PO4A=no
+CONFIGURE_ENV+= ac_cv_path_PO4A=no
CONFIGURE_ARGS= --enable-lzo --enable-bz2 --disable-qt \
--with-boost=${LOCALBASE} \
--with-boost-filesystem=boost_filesystem \
diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile
index b542f2dd3a63..9cd5b346d279 100644
--- a/multimedia/moonlight/Makefile
+++ b/multimedia/moonlight/Makefile
@@ -29,8 +29,8 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomedesktopsharp20
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-cairo=system \
--with-debug=yes \
--with-ff2=no \
diff --git a/multimedia/mp4split/Makefile b/multimedia/mp4split/Makefile
index e1eb273a54fa..6b49f0a75439 100644
--- a/multimedia/mp4split/Makefile
+++ b/multimedia/mp4split/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-expat
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/mp4split
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 01750fe4fb76..e449541ce919 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -36,8 +36,8 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \
--enable-mp4live \
--disable-static
diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
index 497fe84d2e4e..8ed63802588a 100644
--- a/multimedia/mythtv-frontend/Makefile
+++ b/multimedia/mythtv-frontend/Makefile
@@ -42,7 +42,8 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" \
CPPFLAGS+= ${QTCPPFLAGS}
CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
- QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"
+ QTDIR="${QT_PREFIX}"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-audio-alsa --disable-firewire --disable-iptv \
--disable-hdhomerun \
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index ed8ff2d20ccf..d504fd5b099b 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -48,7 +48,8 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" \
CPPFLAGS+= ${QTCPPFLAGS}
CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
- QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"
+ QTDIR="${QT_PREFIX}"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --prefix=${PREFIX} --dvb-path=${LOCALBASE}/include \
--extra-cflags=-g --extra-cxxflags=-g --enable-v4l \
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index 2be767ee29af..704ef965cf57 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
MAKEFILE= makefile
.for app in oggSplit oggDump oggJoin oggCut oggCat oggLength oggSlideshow oggThumb oggResize oggSilence oggScroll mkThumbs mkSlideshow
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index ad3b4af9a107..4b442d93c12f 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -40,13 +40,12 @@ USE_GNOME= glib20 gnomehack intlhack libxml2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= dvdcpy.1 avibox.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index e172e29788bf..c3ed61dad4b0 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -24,8 +24,8 @@ USE_GSTREAMER= gnonlin python good
USE_PYTHON= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBAES}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBAES}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=/var
USE_LDCONFIG= yes
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 1570755b491a..6af9c48fb3c5 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= pygobject gnomehack pkgconfig
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
PLIST_SUB= VERSION="${GST_VERSION}"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE} ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE} ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 55c56bf03fc1..8143b9bcde80 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -24,6 +24,5 @@ USE_PYDISTUTILS= yes
CFLAGS+= -I${PREFIX}/include
LDFLAGS+= -L${PREFIX}/lib
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" # ${CFLAGS} is already there
.include <bsd.port.mk>
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index cd53c784586e..d44963f00f83 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -21,8 +21,8 @@ USE_GNOME= gnomehack gnomeprefix gnomevfs2
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/recmpeg/Makefile b/multimedia/recmpeg/Makefile
index ebd153af4547..740403b4d524 100644
--- a/multimedia/recmpeg/Makefile
+++ b/multimedia/recmpeg/Makefile
@@ -18,13 +18,12 @@ COMMENT= A simple video encoder
LIB_DEPENDS= fame-0.9.1:${PORTSDIR}/multimedia/libfame
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= recmpeg.1
PLIST_FILES= bin/recmpeg
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index 1ca48998ba38..989778f956e4 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -21,7 +21,8 @@ MAN8= rtmpgw.8
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
USE_OPENSSL= yes
-MAKE_ENV= CFLAGS="${PTHREAD_CFLAGS}" THREADLIB="${PTHREAD_LIBS}"
+MAKE_ENV= THREADLIB="${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
PORTDOCS= ChangeLog README
.include <bsd.port.pre.mk>
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 8713693fc03e..e2f4e7555e11 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -26,7 +26,6 @@ GNU_CONFIGURE= yes
USE_GNOME= gtk20
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lswscale
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index b11e6a2d48ea..ce813f359938 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -23,8 +23,8 @@ GNU_CONFIGURE= yes
USE_SDL= sdl
USE_LDCONFIG= yes
CONFIGURE_ENV= GLBASE="${LOCALBASE}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
CC="${CXX}" REAL_CC="${CC}"
+CPPFLAGS+= -I${LOCALBASE}/include
#If you want to try the opengl player (which doesn't seem to work)
#comment out the following line.
diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile
index d5260805ee7a..d6a897158953 100644
--- a/multimedia/spook/Makefile
+++ b/multimedia/spook/Makefile
@@ -33,7 +33,8 @@ NOMAN= defined
SUB_FILES= pkg-message
-CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 71107464bb16..f61403e026de 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -28,9 +28,8 @@ USE_GSTREAMER= good
USE_GETTEXT= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
MAN1= subtitleeditor.1
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index 4a90ef90f0c0..5d310df581e6 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -23,8 +23,8 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= swfdec-thumbnailer.schemas
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 49eae52880d6..fa13547cd6a1 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack gnomeprefix glib20 libxml2 intlhack ltverhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 3020a8a92f4e..b13a5ed0e8ff 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -38,9 +38,9 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
INSTALLS_OMF= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lXrandr" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lXrandr" \
BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}"
MAN1= totem.1 totem-video-thumbnailer.1
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 17b5a3ece2ba..98cc3eea68e6 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -28,8 +28,8 @@ WANT_SDL= yes
WANT_GNOME= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -isystem ${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-libmpeg2-prefix=${LOCALBASE} \
--with-libavcodec-prefix=${LOCALBASE} \
--enable-oss
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index d9cbfcd9dcec..1c93a37cdc4d 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -17,7 +17,6 @@ COMMENT= High performance tool to transcode DVD videos to a smaller size
LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread
USE_GMAKE= yes
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
CFLAGS+= -DHAVE_BUILTIN_EXPECT \
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index ee9c449ba6a6..4cdb51487ad4 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -24,8 +24,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig lthack
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= cdxa2mpeg.1 vcdimager.1 vcdxminfo.1 vcdxrip.1 vcdxgen.1 \
vcdxbuild.1 vcd-info.1
diff --git a/multimedia/vdpau-video/Makefile b/multimedia/vdpau-video/Makefile
index de12ba705c66..a471b95020b4 100644
--- a/multimedia/vdpau-video/Makefile
+++ b/multimedia/vdpau-video/Makefile
@@ -26,7 +26,6 @@ USE_GL= gl
GNU_CONFIGURE= yes
CPPFLAGS+= -isystem${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 85bb802ce561..1ddb320b5e3b 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -109,8 +109,9 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${FAKEDIR}/include -I${WRKSRC}/include \
-I${LOCALBASE}/include -I${LOCALBASE}/ffmpeg \
${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib \
- -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc" LIBS="-lc"
+CONFIGURE_ENV= LIBS="-lc"
+LDFLAGS+= -L${FAKEDIR}/lib \
+ -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc
CONFIGURE_ARGS+= --enable-vlc \
--enable-avcodec \
diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile
index a8d65222d402..f66830329218 100644
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@@ -25,7 +25,6 @@ PORTDOCS= COPYING ChangeLog README
PLIST_FILES= bin/${PORTNAME}
MAN1= w_scan.1
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -f ${FILESDIR}/types.sed ${WRKSRC}/configure ${WRKSRC}/*.c ${WRKSRC}/*.h
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index cb37b88517f1..7c2e4a347e89 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -32,8 +32,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_XORG= x11 xaw
-CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
- CFLAGS="-I${WRKSRC}/common"
+CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
+CFLAGS+= -I${WRKSRC}/common
MAKE_ENV= verbose=yes
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= alpha amd64 i386
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 268191ced71d..2430b7fc2ad4 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -99,8 +99,8 @@ DESKTOP_ENTRIES="XBMC" \
"AudioVideo;Video;" \
true
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-external-libraries
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 4458a4a599aa..ebf679464257 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -35,9 +35,9 @@ CONFIGURE_ARGS= --disable-power-manager-plugin \
--enable-taglib \
--disable-gtk-doc-html \
--without-html-dir
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- ac_cv_prog_AWK="${AWK}"
+CONFIGURE_ENV= ac_cv_prog_AWK="${AWK}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig \
desktopfileutils
USE_XFCE= configenv libgui libutil
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 0c6126cafb27..21aafd273363 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -27,10 +27,10 @@ USE_GMAKE= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-vdr-keys
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
THREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
MANLANG= "" de es fr pl
diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile
index 13a18407f944..c5f47f628499 100644
--- a/multimedia/xmms-status-plugin/Makefile
+++ b/multimedia/xmms-status-plugin/Makefile
@@ -19,8 +19,8 @@ USE_XORG= x11 xpm
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
${REINPLACE_CMD} -e 's,-Werror,,' ${WRKSRC}/configure
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 46ddde42b370..839a3b06b4c7 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -26,12 +26,12 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= automake autoconf libtool
AUTOTOOLSFILES= aclocal.m4
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
INPUT_PLUGINS="${INPUT_PLUGINS}" \
OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --enable-static=no
MAN1= wmxmms.1 xmms.1
SUB_FILES= pkg-message xmms.desktop
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 926c1e80d5cf..a2c12431568e 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -26,11 +26,10 @@ USE_GNOME= gtk12
USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-gl
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index c141efb19738..d229a562ec8d 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -31,13 +31,12 @@ USE_GNOME= gtk20
USE_OPENSSL= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libltdl libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-oscar --disable-workwizu --enable-smtp --enable-lj
MAN1= ayttm.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/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 1dbada74d068..6f2846aea909 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -20,8 +20,8 @@ USE_ICONV= yes
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lstdc++
CONFIGURE_ARGS= --with-openssl --disable-konst
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 258d85820363..8f98573b5119 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -21,8 +21,8 @@ USE_ICONV= yes
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+CXXFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-ssl --with-openssl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]*
diff --git a/net-im/cli-msn/Makefile b/net-im/cli-msn/Makefile
index f5efd28430e7..c03250357b06 100644
--- a/net-im/cli-msn/Makefile
+++ b/net-im/cli-msn/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
WRKSRC= ${WRKDIR}/climsn
SUB_FILES= pkg-message
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index cfeccae534c9..2a9f2167ceec 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -18,7 +18,6 @@ COMMENT= CLI-based Multi-Messenger
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
LDFLAGS+= -L${LOCALBASE}/lib
MAN1= climm.1
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 614eff0d117c..64d5163fc04e 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -42,8 +42,8 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PYTHON= yes
MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-Werror \
--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index 015e363702fe..d064f51605c6 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gnomehack pkgconfig glib20 ltverhack \
pygtk2
USE_GSTREAMER= core good bad python
USE_AUTOTOOLS= libtool
-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/net-im/folks/Makefile b/net-im/folks/Makefile
index 1083d01f2888..fec8de126d2c 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG= yes
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
PLIST_SUB= VERSION=16
diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile
index e211bc3593e5..2dd7fcf607a3 100644
--- a/net-im/freetalk/Makefile
+++ b/net-im/freetalk/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile
USE_GNOME= pkgconfig glib20
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= freetalk.1
INFO= freetalk
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 5853b98e2e10..0daee57b39a3 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALL=""
+CONFIGURE_ENV= INSTALL=""
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.include <bsd.port.mk>
diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index e24e383ac53a..b154c9326acd 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -28,8 +28,9 @@ USE_GNOME= pygtk2
USE_PYTHON= 2.5+
USE_XORG= x11 xext xscrnsaver
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+= PYTHON=${PYTHON_CMD}
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index f08cf8e2f086..ed06f9526cb3 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -27,8 +27,9 @@ USE_GNOME= pygtk2
USE_PYTHON= 2.5+
USE_XORG= x11 xext xscrnsaver
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+= PYTHON=${PYTHON_CMD}
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
OPTIONS= DBUS "Adds support for D-Bus (Desktop Bus)" On \
NLS "Native Language Support via gettext utilities" On
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 4a236c2c4fef..18b671d01578 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -30,7 +30,6 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \
-I${LOCALBASE}/include/w3c-libwww
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
# cheesy hack - test-oop doesn't build, but we don't care.
pre-configure:
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 8d2ae3044e32..d7513a4f1371 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk12 gnomehack gnomeprefix
WANT_GNOME= 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/net-im/gloox/Makefile b/net-im/gloox/Makefile
index 22f2149733f2..46e57438e0dd 100644
--- a/net-im/gloox/Makefile
+++ b/net-im/gloox/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
post-patch:
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index bde5890c9740..707e146a98a0 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -35,8 +35,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel gnomedocutils \
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --enable-dbus=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gossip.schemas
diff --git a/net-im/gyach/Makefile b/net-im/gyach/Makefile
index 7dd6bb9de1a2..2520e76676b9 100644
--- a/net-im/gyach/Makefile
+++ b/net-im/gyach/Makefile
@@ -15,8 +15,8 @@ MAINTAINER?= aaron@snaphat.com
COMMENT= Gyach is a GTK+ based Yahoo! Chat client
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_GNOME= gtk20
.include <bsd.port.pre.mk>
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index cfc5de15d38b..95bbadc2119b 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \
--with-gtkmm-prefix=${LOCALBASE} \
--with-gnome=no
-CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
+CPPFLAGS+= `${LOCALBASE}/bin/sigc-config --cflags`
post-patch:
@${REINPLACE_CMD} -E -e 's|(gtkmm_config_args[[:space:]]*=).+$$|\1|' \
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 59a94982d170..ed46c8885798 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -56,7 +56,6 @@ JABBER_RUNDIR= "/var/run/jabberd"
JABBER_SPOOLDIR="/var/spool/jabberd"
JABBER_LOGDIR= "/var/log/jabberd"
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --localstatedir=/var \
--sysconfdir=${JABBER_ETCDIR} \
--includedir=${PREFIX}/include/jabber \
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile
index 0bd8ea425b87..0b1841f65ca1 100644
--- a/net-im/jggtrans/Makefile
+++ b/net-im/jggtrans/Makefile
@@ -22,10 +22,9 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= glib20 pkgconfig
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
USE_RC_SUBR= jggtrans.sh
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 11b11b8dc2a3..274224fbc838 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
CONFIGURE_ARGS+= --prefix=${LOCALBASE}
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
post-patch:
.for i in replacepage identityeditdialog identitysetting \
diff --git a/net-im/komclean/Makefile b/net-im/komclean/Makefile
index 9cc37bd85e01..7f21ba764bb0 100644
--- a/net-im/komclean/Makefile
+++ b/net-im/komclean/Makefile
@@ -26,7 +26,6 @@ MAN1= komclean
WRKSRC= ${WRKDIR}/${PKGNAME}
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
DESKTOP_ENTRIES="KOMclean" \
"${COMMENT}" \
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index 92dd4b5abfc6..b0570f008996 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -13,10 +13,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
-BUILD_DEPENDS= \
- pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS= \
- speex.1:${PORTSDIR}/audio/speex \
+BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
ilbc.0:${PORTSDIR}/net/ilbc \
ortp.5:${PORTSDIR}/net/ortp \
expat.6:${PORTSDIR}/textproc/expat2
@@ -30,12 +28,9 @@ USE_AUTOTOOLS= libtool
USE_DOS2UNIX= README
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= \
- --with-ilbc=${LOCALBASE} \
+CONFIGURE_ARGS= --with-ilbc=${LOCALBASE} \
--with-speex=${LOCALBASE}
-CONFIGURE_ENV= \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g" \
- PKG_CONFIG="${PKG_CONFIG}" \
+CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
EXPAT_CFLAGS="-I${LOCALBASE}/include" \
EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
GLIB_CFLAGS="$$(${PKG_CONFIG} --cflags glib-2.0)" \
@@ -44,22 +39,20 @@ CONFIGURE_ENV= \
ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \
SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)"
+CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} ${PTHREAD_CFLAGS} -g
MAKE_JOBS_SAFE= yes
-DOC_FILES= \
- AUTHORS \
+DOC_FILES= AUTHORS \
ChangeLog \
DOCUMENTATION \
NEWS \
README
.ifndef(NOPORTDOCS)
-PORTDOCS= \
- ${DOC_FILES}
+PORTDOCS= ${DOC_FILES}
.endif
-PLIST_FILES+= \
- bin/login \
+PLIST_FILES+= bin/login \
bin/pcp \
bin/relayserver \
bin/stunserver \
diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile
index 2a262071d560..8be2a43aaa4e 100644
--- a/net-im/libnice/Makefile
+++ b/net-im/libnice/Makefile
@@ -20,8 +20,8 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack
USE_GSTREAMER= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GETIFADDRS" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|__BYTE_ORDER|_BYTE_ORDER|g ; \
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index fa1e16b69f88..e2a0716b31e9 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -25,9 +25,9 @@ CONFIGURE_ARGS?=--disable-gtkui \
--with-dynamic_prpls=${PRPL_MODULES:S/,$//} \
--enable-static \
--disable-nm
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PTHREAD_LIB="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
.if !defined(PIDGIN_SLAVE)
# Pidgin slave ports that require the following functionality, must explicitly
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index a66e120f7668..d9cea4ef75e8 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -23,8 +23,8 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 ltverhack
CONFIGURE_ARGS= --disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib
OPTIONS= GNUTLS "Enable SSL (via GnuTLS) support" on \
OPENSSL "Enable SSL (via OpenSSL) support" off
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 006b64fc3775..3c62060c1734 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -21,7 +21,8 @@ LICENSE= GPLv2
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sigwinch --libdir=${PREFIX}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_ICONV= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index fcdfcad905ed..a612f374ea94 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-doxygen=no \
--with-gmp-prefix=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-doc-${PORTVERSION}
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 5b3252132795..dccb1bec9e11 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= pkgconfig intltool
-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/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index 731861daa150..67cc78f62877 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -22,8 +22,8 @@ MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 95d1c5b8074b..429f2270fef3 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -22,7 +22,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gtk20
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/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 60ca66dbe6ab..36d1ee566388 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -34,8 +34,8 @@ USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --disable-static
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 018fd3bbed44..589f7e10c539 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG= yes
USE_PYTHON= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig glib20 ltverhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index e927679647cd..d7bd49db9604 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
GNU_CONFIGURE= yes
-LDFLAGS= ${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig glib20
USE_OPENSSL= yes
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index c7cc430bc0c3..b72ef3394ef3 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= purple.10:${PORTSDIR}/net-im/libpurple \
telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
USE_GNOME= pkgconfig
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index edaad77edc5c..f3f99eeb3802 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -30,7 +30,8 @@ USE_GNOME= gnomehack pkgconfig glib20
MAN8= telepathy-idle.8
-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/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index e39ed74f8261..bbbaa6747f1a 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \
USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index 43fe33ba4456..0e977fd98217 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -25,8 +25,8 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
USE_PYTHON= 2.5+
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
.include <bsd.port.mk>
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 4308ca184378..16a4a6c12d11 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig
USE_OPENSSL= yes
USE_PYTHON_BUILD= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
- LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
MAN8= telepathy-salut.8
diff --git a/net-im/vqcc-gtk/Makefile b/net-im/vqcc-gtk/Makefile
index 256d52cece46..6319783b10f1 100644
--- a/net-im/vqcc-gtk/Makefile
+++ b/net-im/vqcc-gtk/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_GNOME= gnomehack gnomeprefix gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-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.mk>
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index 3ef69726e0ca..dd2d52b3fabb 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -23,9 +23,8 @@ USE_ICONV= yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS+="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
MAN1= ysm.1
PLIST_FILES= bin/ysm
diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile
index 3ff59eabe137..30a95580f770 100644
--- a/net-im/zephyr/Makefile
+++ b/net-im/zephyr/Makefile
@@ -43,6 +43,5 @@ KRB5_DIR?= ${DESTDIR}/usr
# it is an upstream bug that --with-krb5 needs a path
CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}"
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
.include <bsd.port.mk>
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index bf7dc18c0d20..d3678f897e6d 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -17,9 +17,9 @@ COMMENT= A set of utilities to configure and monitor wireless access points
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_ICONV= yes
-CONFIGURE_ENV= LDFLAGS="-lintl -L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lintl -L${LOCALBASE}/lib
MAN8= ap-trapd.8 ap-mrtg.8 ap-config.8
.if !defined(WITHOUT_NLS)
diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile
index 6585d11ade2c..0e7efe604ec1 100644
--- a/net-mgmt/cacti-spine/Makefile
+++ b/net-mgmt/cacti-spine/Makefile
@@ -24,8 +24,8 @@ LIB_DEPENDS= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE}
-CONFIGURE_ENV= LDFLAGS="`net-snmp-config --libs`" \
- CPPFLAGS="`net-snmp-config --cflags`"
+CPPFLAGS+= `net-snmp-config --cflags`
+LDFLAGS+= `net-snmp-config --libs`
USE_MYSQL= YES
USE_OPENSSL= YES
USE_AUTOTOOLS= libtool
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 0907e45da33c..62c7b5b2a72b 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -53,9 +53,8 @@ USE_LDCONFIG= yes
CONFLICTS= collectd-5.[0-9]*
-CPPFLAGS= -I${LOCALBASE}/include
-
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 0583772d4c8e..749a67e07353 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -54,9 +54,8 @@ USE_LDCONFIG= yes
CONFLICTS= collectd-4.[0-9]*
-CPPFLAGS= -I${LOCALBASE}/include
-
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile
index fa8285052f8c..c08d38eb3e33 100644
--- a/net-mgmt/disco/Makefile
+++ b/net-mgmt/disco/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= jadawin@FreeBSD.org
COMMENT= IP discovery and fingerprinting utility
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index aa3cfc9d29be..0b314d3cfecd 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -18,8 +18,8 @@ USE_GNOME= libglade2 libgnomeui gnomehack gnomeprefix
USE_GMAKE= 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
MAN1= etherape.1
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 282470dba965..ffc8c26f7539 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -43,8 +43,7 @@ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
CFLAGS+= ${PTHREAD_CFLAGS}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- LIBS="${LDFLAGS}"
+CONFIGURE_ENV+= LIBS="${LDFLAGS}"
CONFIGURE_ARGS+= --enable-plugins
.if !defined(WITHOUT_GTK)
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index 2f8cada12fd4..b72dcc6791cd 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -43,7 +43,7 @@ ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin
.include <bsd.port.pre.mk>
-CPPFLAGS= -I${LOCALBASE}/include -fPIC
+CPPFLAGS+= -I${LOCALBASE}/include -fPIC
CFLAGS+= ${CPPFLAGS}
CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \
@@ -62,10 +62,7 @@ CONFIGURE_ARGS= --with-command-user=${ICINGAUSER} \
--with-checkresult-dir=${ICINGADIR}/checkresults \
--disable-statuswrl
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PERL=${PERL}
MAKE_JOBS_UNSAFE= yes
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 0de44995ef80..989474534af6 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= kismet.1 kismet_drone.1
MAN5= kismet.conf.5 kismet_drone.conf.5
diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile
index 4d8f2bb18b61..673bc578d267 100644
--- a/net-mgmt/mbrowse/Makefile
+++ b/net-mgmt/mbrowse/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
PLIST_FILES= bin/mbrowse
USE_GNOME= gtk20
CONFIGURE_ARGS= --with-snmp-prefix=${PREFIX} --with-snmp-type=net
-CONFIGURE_ENV= LDFLAGS="`net-snmp-config --libs`" \
- CPPFLAGS="`net-snmp-config --cflags`"
+CPPFLAGS+= `net-snmp-config --cflags`
+LDFLAGS+= `net-snmp-config --libs`
.include <bsd.port.mk>
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index e6d7ec68409f..76aec908db60 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -50,7 +50,7 @@ NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin
.include <bsd.port.pre.mk>
-CPPFLAGS= -I${LOCALBASE}/include -fPIC
+CPPFLAGS+= -I${LOCALBASE}/include -fPIC
CFLAGS+= ${CPPFLAGS}
CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
@@ -69,10 +69,7 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--with-checkresult-dir=${NAGIOSDIR}/checkresults \
--disable-statuswrl
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PERL=${PERL}
MAKE_JOBS_UNSAFE= yes
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index f477e7656689..3e61ea946827 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -56,10 +56,10 @@ CONFIGURE_ARGS= --with-nagios-user=${NAGIOSUSER} \
--localstatedir=${NAGIOSDIR} \
--prefix=${PREFIX}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- PERL=${PERL}
+CONFIGURE_ENV= PERL=${PERL}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.if defined(WITH_QSTAT)
BUILD_DEPENDS+= qstat:${PORTSDIR}/games/qstat
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 3bc7dae3d077..4710a292dbf5 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/cgi-bin \
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
# Workaround configure.in lameness.
-CONFIGURE_ENV+= CPPFLAGS="`net-snmp-config --cflags`"
+CPPFLAGS+= `net-snmp-config --cflags`
.include <bsd.port.pre.mk>
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index cc6ca868a413..a942f361c9e1 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -48,7 +48,7 @@ GROUPS= ${NAGIOSGROUP}
.include <bsd.port.pre.mk>
-CPPFLAGS= -I${LOCALBASE}/include -fPIC
+CPPFLAGS+= -I${LOCALBASE}/include -fPIC
CFLAGS+= ${CPPFLAGS}
CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
@@ -67,8 +67,7 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--with-checkresult-dir=${NAGIOSDIR}/checkresults \
--disable-statuswrl
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PERL=${PERL}
MAKE_JOBS_UNSAFE= yes
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 37fbcd010d00..9ebda1ab6431 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -51,7 +51,7 @@ NAGIOSHOMEURL?= main.html
.include <bsd.port.pre.mk>
-CPPFLAGS= -I${LOCALBASE}/include -fPIC
+CPPFLAGS+= -I${LOCALBASE}/include -fPIC
CFLAGS+= ${CPPFLAGS}
CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
@@ -67,10 +67,7 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--localstatedir=${NAGIOSDIR} \
--prefix=${PREFIX}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PERL=${PERL}
MAKE_JOBS_UNSAFE= yes
diff --git a/net-mgmt/nbtscan/Makefile b/net-mgmt/nbtscan/Makefile
index 53fae8c6d6f2..c157d4d3453b 100644
--- a/net-mgmt/nbtscan/Makefile
+++ b/net-mgmt/nbtscan/Makefile
@@ -19,8 +19,8 @@ COMMENT= NetBIOS name network scanner
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}a
ALL_TARGET= nbtscan
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index fc40555f8e15..46a6d2c0efd4 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -18,11 +18,11 @@ COMMENT= A network monitoring daemon
USE_RC_SUBR= nefu
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
YACC=${YACC} \
OPENSSL_CFLAGS="-I${OPENSSLINC}" \
OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} \
--without-sasl \
--without-zlib \
diff --git a/net-mgmt/nettop/Makefile b/net-mgmt/nettop/Makefile
index 15dbb7d91717..c83f53a8c81b 100644
--- a/net-mgmt/nettop/Makefile
+++ b/net-mgmt/nettop/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-slang-libraries=${LOCALBASE}/lib \
--with-slang-includes=${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-lcurses"
+LDFLAGS+= -lcurses
PLIST_FILES= bin/nettop
PORTDOCS= README THANKS ChangeLog
diff --git a/net-mgmt/packit/Makefile b/net-mgmt/packit/Makefile
index 341a94477b2a..293d10c32e88 100644
--- a/net-mgmt/packit/Makefile
+++ b/net-mgmt/packit/Makefile
@@ -18,7 +18,7 @@ COMMENT= Network auditing tool
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"
+CPPFLAGS+= `${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`
MAN8= packit.8
PLIST_FILES= sbin/packit
diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index 6d35a7af15d3..9ba425b6f56b 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -20,8 +20,8 @@ LICENSE= GPLv2
USE_RC_SUBR= pmacctd
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-LDFLAGS= "-L${LOCALBASE}/lib"
+CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= "-L${LOCALBASE}/lib"
OPTIONS= MYSQL "Enable MySQL support." Off \
PGSQL "Enable PostgreSQL support." Off \
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 7891b95ffb51..f7e7beed6ac0 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -23,14 +23,14 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-site-packages-prefix=${PREFIX}
.include <bsd.port.pre.mk>
.if (${OSVERSION} >= 800000) && (${ARCH} == "i386")
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -fstack-protector -I${LOCALBASE}/include"
+CPPFLAGS+= -fstack-protector -I${LOCALBASE}/include
.endif
post-patch:
diff --git a/net-mgmt/satellite/Makefile b/net-mgmt/satellite/Makefile
index ff3ef7b8034e..cb73874fae8a 100644
--- a/net-mgmt/satellite/Makefile
+++ b/net-mgmt/satellite/Makefile
@@ -5,24 +5,24 @@
# $FreeBSD$
#
-PORTNAME= satellite
-PORTVERSION= 1.0.2
+PORTNAME= satellite
+PORTVERSION= 1.0.2
PORTREVISION= 1
-CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/network
+CATEGORIES= net-mgmt
+MASTER_SITES= ${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=system/network
MAINTAINER= ports@FreeBSD.org
COMMENT= A system for tracking machines with dynamic IP addresses
-LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib'
+GNU_CONFIGURE= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --localstatedir=/var/log
-MAN8= satcfg.8 satellite.8 satellited.8 satwatch.8
+MAN8= satcfg.8 satellite.8 satellited.8 satwatch.8
pre-install:
@${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index 941ba5784bfa..88196a24300f 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_BZIP2= YES
GNU_CONFIGURE= YES
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
MAKE_ARGS= RM="${RM} -f"
MAN1= wbemcli.1
diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile
index c4fcf58f8ebd..2c190dcb03f7 100644
--- a/net-mgmt/sing/Makefile
+++ b/net-mgmt/sing/Makefile
@@ -20,8 +20,9 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-libpcap-prefix=/usr
-CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --defines` \
- `${LIBNET_CONFIG} --cflags`" LIBS="`${LIBNET_CONFIG} --libs`"
+CONFIGURE_ENV= LIBS="`${LIBNET_CONFIG} --libs`"
+CPPFLAGS+= `${LIBNET_CONFIG} --defines` \
+ `${LIBNET_CONFIG} --cflags`
MAN8= sing.8
PLIST_FILES= sbin/sing
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index f2abe0fd99c7..a4893f9bdd4b 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -33,10 +33,8 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
--with-pngdir=${NAGIOSDIR}/snmp4nagios/png \
--prefix=${PREFIX}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index 21be8570cfad..53737d08edc4 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -18,8 +18,8 @@ COMMENT= Tools for the Wi-Spy spectrum analyzers from MetaGeek LLC
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
PORTDOCS= README
diff --git a/net-mgmt/zabbix-server/Makefile b/net-mgmt/zabbix-server/Makefile
index 54fd18d849e7..1cabcee84b7f 100644
--- a/net-mgmt/zabbix-server/Makefile
+++ b/net-mgmt/zabbix-server/Makefile
@@ -47,7 +47,8 @@ SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
MAKE_ARGS+= ARCH=freebsd
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD}
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if ${ZABBIX_BUILD} != "agent"
LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 54fd18d849e7..1cabcee84b7f 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -47,7 +47,8 @@ SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
MAKE_ARGS+= ARCH=freebsd
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD}
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if ${ZABBIX_BUILD} != "agent"
LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 3129aa21a3ee..6733880e01cf 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -34,8 +34,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-denoise-level=0
CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
- docdir='$${prefix}/${DOCSDIR_REL}' \
- LDFLAGS="${LDFLAGS}"
+ docdir='$${prefix}/${DOCSDIR_REL}'
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= ${PTHREAD_CFLAGS}
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 5e5ffa94f66b..40610ba5a5fe 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -33,8 +33,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-denoise-level=0
CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
- docdir='$${prefix}/${DOCSDIR_REL}' \
- CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+ docdir='$${prefix}/${DOCSDIR_REL}'
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= ${PTHREAD_CFLAGS}
diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile
index 3fffcd7ee3af..e51d54af9142 100644
--- a/net-p2p/dctc-gui-qt/Makefile
+++ b/net-p2p/dctc-gui-qt/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= dctc:${PORTSDIR}/net-p2p/dctc
USE_QT_VER= 3
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PLIST_FILES= bin/dc_qt
OPTIONS= XINE "Enable support for video preview using libxine" off
diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile
index ab1405b1669b..ac9a53fa2cde 100644
--- a/net-p2p/dctc/Makefile
+++ b/net-p2p/dctc/Makefile
@@ -27,8 +27,6 @@ USE_PERL5_RUN= yes
GNU_CONFIGURE= yes
LDFLAGS+= ${PTHREAD_LIBS:S/"//g}
CPPFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-manual-db-detect --with-db=${LOCALBASE}
MANCOMPRESSED= no
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index fd4431c7e531..c21202210cff 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -18,8 +18,8 @@ COMMENT= A GNOME client for Hotline
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
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index a97345306a34..1826fe9ae490 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -27,8 +27,6 @@ USE_GMAKE= yes
USE_PERL5= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
USE_RC_SUBR= giftd
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index d75d842593bf..2f263c72a1de 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gtk20 gnomeprefix gnomehack
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-included-gettext
MAN1= giFToxic.1
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 03e2217461fe..3146fb5938dc 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -37,7 +37,6 @@ USE_GNOME= gnomehack libglade2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libltdl libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-dialog=no \
--with-cdialog=no \
--with-qt=no \
@@ -55,8 +54,8 @@ MAN1= gnunet-auto-share.1 gnunet-chat.1 gnunet-directory.1 \
gnunet-update.1 gnunet-vpn.1 gnunetd.1
MAN5= gnunet.conf.5 gnunetd.conf.5
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DBDIR= /var/db/${PORTNAME}
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index 46d15acad5a3..bb29af35bf77 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -17,8 +17,8 @@ COMMENT= A GTK+ version of Hx, a UNIX Hotline Client
USE_GNOME= gdkpixbuf gnomehack
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= gtkhx.1
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 1ce034f31584..8b8c2cf59416 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
USE_GNOME= gtk20 gnomehier intlhack
USE_GMAKE= 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-pixmapsdir=${PREFIX}/share/pixmaps \
--with-desktopdir=${PREFIX}/share/applications
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index c6ca9b328ad4..c9d2b00d943c 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
WITH_BDB_VER?= 43
-CONFIGURE_ENV+= "CPPFLAGS=-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
OPTIONS= GUI "Build the gtk2 gui" off \
BDB "Build with Berkeley DB support (for jigdo-file cache)" on \
@@ -44,8 +44,8 @@ PLIST_SUB+= GUI="@comment "
.endif
.if !defined(WITHOUT_BDB)
-CONFIGURE_ENV+= CPPFLAGS=-I${BDB_INCLUDE_DIR} \
- LIBS=-L${BDB_LIB_DIR}
+CONFIGURE_ENV+= LIBS=-L${BDB_LIB_DIR}
+CPPFLAGS+= -I${BDB_INCLUDE_DIR}
CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME}
USE_BDB= ${WITH_BDB_VER}
.else
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index a7394d9135fa..5a50da146f71 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= protocol-ext.txt protocol.txt
diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index eac58c9f99bf..7fb79a8aa9f0 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -26,7 +26,6 @@ USE_GNOME= gnomehack
USE_OPENSSL= yes
USE_AUTOTOOLS= aclocal automake autoconf libtool
ACLOCAL_ARGS= -I m4
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug \
--disable-python-binding \
--disable-examples \
@@ -43,8 +42,8 @@ CONFIGURE_ARGS= --disable-debug \
--with-zlib=system
USE_LDCONFIG= yes
-CPPFLAGS= ${PTHREAD_CFLAGS}
-LDFLAGS= ${PTHREAD_LIBS}
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.if !defined(NOPORTDOCS)
PORTDOCS= *
diff --git a/net-p2p/libtorrent-rasterbar-15/Makefile b/net-p2p/libtorrent-rasterbar-15/Makefile
index 4344e1abb1ec..aab260eca89c 100644
--- a/net-p2p/libtorrent-rasterbar-15/Makefile
+++ b/net-p2p/libtorrent-rasterbar-15/Makefile
@@ -28,7 +28,6 @@ USE_GNOME= gnomehack
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --disable-debug \
--disable-static \
--enable-dht \
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 9e55a19b32c9..d02be73e2e66 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk12
CONFIGURE_ARGS= --with-pthread=yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+= "-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
OPTIONS= FLAC "Include FLAC support" On \
OGG "Include OGG support" On \
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 997dc61229a5..49cdaf3bfef3 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -30,15 +30,13 @@ ALL_TARGET= opt
MAKE_ENV+= OCAMLRUNPARAM="l=256M"
MAKE_JOBS_UNSAFE= yes
-CONFIGURE_ARGS+=\
- --enable-ocamlver=3 \
+CONFIGURE_ARGS+=--enable-ocamlver=3 \
--with-libiconv-prefix=${LOCALBASE}
-CONFIGURE_ENV+= \
- NEWCXX="${CXX}" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+CONFIGURE_ENV+= NEWCXX="${CXX}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
###
## Library dependency handling
diff --git a/net-p2p/moodriver/Makefile b/net-p2p/moodriver/Makefile
index 1eb111f6c209..f048bb442984 100644
--- a/net-p2p/moodriver/Makefile
+++ b/net-p2p/moodriver/Makefile
@@ -17,8 +17,8 @@ COMMENT= C++ museekd client library
LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CXXFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
USE_GETTEXT= yes
USE_GNOME= glib20 pkgconfig
diff --git a/net-p2p/mooseekd/Makefile b/net-p2p/mooseekd/Makefile
index f25bd29e87a0..8ffbd12c84c6 100644
--- a/net-p2p/mooseekd/Makefile
+++ b/net-p2p/mooseekd/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CXXFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
USE_FAM= yes
USE_ICONV= yes
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index a845157c148d..5fcb02846081 100644
--- a/net-p2p/opendchub/Makefile
+++ b/net-p2p/opendchub/Makefile
@@ -17,13 +17,12 @@ USE_PERL5= yes
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
PORTDOCS= README configfiles general scriptdoc
PLIST_FILES= bin/${PORTNAME}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
pre-install:
@${CHMOD} a+rx ${WRKSRC}/install-sh
diff --git a/net-p2p/qtorrent/Makefile b/net-p2p/qtorrent/Makefile
index 431ae21d9e84..7eddcae945e9 100644
--- a/net-p2p/qtorrent/Makefile
+++ b/net-p2p/qtorrent/Makefile
@@ -23,9 +23,9 @@ USE_PYTHON= yes
USE_PYDISTUTILS=yes
.if defined(PACKAGE_BUILDING)
-TMPDIR?= /tmp
-MAKE_ENV+= TMPDIR="${TMPDIR}"
-CONFIGURE_ENV+= TMPDIR="${TMPDIR}"
+TMPDIR?= /tmp
+MAKE_ENV+= TMPDIR="${TMPDIR}"
+CONFIGURE_ENV+= TMPDIR="${TMPDIR}"
.endif
pre-everything::
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index 2cd83ef64c1c..f39f8ff30add 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -25,7 +25,7 @@ CONFLICTS?= rtorrent-devel-[0-9]*
USE_GCC= 4.2+
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -pthread"
+LDFLAGS+= -pthread
CONFIGURE_ARGS= --disable-debug
SUB_FILES= pkg-message
diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile
index 2cf6c6cdc13b..988a4275481a 100644
--- a/net-p2p/teknap/Makefile
+++ b/net-p2p/teknap/Makefile
@@ -32,8 +32,8 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
DOCSDIR= ${PREFIX}/share/doc/TekNap
PORTDOCS= *
-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/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index ca2f64336d9b..ff7aa8aaeabf 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE= yes
USE_GNOME?= pkgconfig
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS=--with-zlib=/usr \
--disable-libappindicator \
--disable-gconf2 \
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index f9e32dce4dd3..750b6c7d1308 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -32,7 +32,7 @@ USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CFLAGS+= -I${QT_INCDIR}
-LDFLAGS= -L${QT_LIBDIR}
+LDFLAGS+= -L${QT_LIBDIR}
QTCFGLIBS+= ${PTHREAD_LIBS}
CONFIGURE_ENV+= DCLIB_CFLAGS=-I${LOCALBASE}/include
diff --git a/net-p2p/verlihub-plugins-luascript/Makefile b/net-p2p/verlihub-plugins-luascript/Makefile
index cd3b19388976..6c0c2087b10e 100644
--- a/net-p2p/verlihub-plugins-luascript/Makefile
+++ b/net-p2p/verlihub-plugins-luascript/Makefile
@@ -19,9 +19,9 @@ PLUGIN_DESC= LuaScript
USE_LUA= 5.1
WRKSRC= ${WRKDIR}/${DISTNAME}
-CONFIGURE_ENV= CXXFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS= -I${LUA_INCDIR}
-LDFLAGS= -L${LUA_LIBDIR}
+CXXFLAGS+= ${LDFLAGS}
+CPPFLAGS+= -I${LUA_INCDIR}
+LDFLAGS+= -L${LUA_LIBDIR}
OPTIONS= SOCKET "Build with LuaSocket support" Off
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 5a585b8f2008..1f5bd098226d 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -38,7 +38,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
MAKE_ENV+= MAKE="${MAKE}" \
DATADIR="${DATADIR}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
.include <bsd.port.pre.mk>
diff --git a/net/arping/Makefile b/net/arping/Makefile
index a59180eb230f..8d96f3b7933b 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -17,10 +17,10 @@ COMMENT= ARP level "ping" utility
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS+="`${LIBNET_CONFIG} --defines`" \
- CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`${LIBNET_CONFIG} --libs` -lpcap"
+CONFIGURE_ENV= LIBS="`${LIBNET_CONFIG} --libs` -lpcap"
+CFLAGS+= `${LIBNET_CONFIG} --defines`
+CPPFLAGS+= -I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index c47b4648063c..0eac20ff0e47 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
-LDFLAGS= -L${LOCALBASE}/lib
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE= yes
USE_GNOME= libxml2
USE_BISON= build
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index dc3e047ee537..449eab1796d0 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -22,10 +22,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
-LDFLAGS= -L${LOCALBASE}/lib
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE= yes
USE_GNOME= libxml2
USE_BISON= build
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index a6b87537751a..dbfe2fb962a8 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -26,10 +26,10 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE= yes
USE_BISON= build
USE_RC_SUBR= asterisk.sh
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 2796641e2d87..d7dc91b5813c 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 amd64 sparc64
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE= yes
USE_GNOME= libxml2
USE_BISON= build
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 5ce0a5f846a1..41b2a694cbe4 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -37,10 +37,10 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
--disable-doxygen-dot \
--localstatedir=/var \
--enable-compat-howl
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE
+LDFLAGS+= -L${LOCALBASE}/lib
.if ${AVAHI_SLAVE}=="no"
CONFLICTS= howl-[0-9]*
diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile
index 0d3ee5d1deff..b4f7ed3ac378 100644
--- a/net/bfilter/Makefile
+++ b/net/bfilter/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= ACE.5:${PORTSDIR}/devel/ace \
sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN8= bfilter.8
USE_RC_SUBR= bfilter.sh
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index 29b2593b900e..a1e5635ad218 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -17,7 +17,8 @@ COMMENT= Portable bandwidth monitor and rate estimator
OPTIONS= RRDTOOL "Enable RRD support" Off \
DBI "Enable DBI support" On
-CONFIGURE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib" "CPPFLAGS=-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --disable-asound
USE_GMAKE= YES
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 18a462d4df46..f50b3c4b4774 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS= --disable-server
CPPFLAGS+= -I${LOCALBASE}/include
CXXFLAGS:= ${CXXFLAGS:N-O*:N-f*} -O3
CFLAGS:= ${CFLAGS:N-O*:N-f*} -O3
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" CXXFLAGSS="${CXXFLAGS}" CFLAGS="${CFLAGS}"
+CONFIGURE_ENV= CXXFLAGSS="${CXXFLAGS}"
OPTIONS= X11 "Build Boinc Manager GUI" on \
ALT "Accept Linux science applications" off
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 803801909020..f6308835e3e4 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -21,9 +21,9 @@ GNU_CONFIGURE= yes
USE_ICONV= yes
USE_OPENSSL= yes
-CONFIGURE_ENV= CPPFLAGS="-I/usr/local/include" \
- LDFLAGS="-L/usr/local/lib" \
- LIBS="-L/usr/local/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= c3270.1 \
x3270if.1 \
diff --git a/net/clamz/Makefile b/net/clamz/Makefile
index b9e76ea2e478..e564b7b6346a 100644
--- a/net/clamz/Makefile
+++ b/net/clamz/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
expat.6:${PORTSDIR}/textproc/expat2 \
gcrypt.18:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
diff --git a/net/csync2/Makefile b/net/csync2/Makefile
index b4c2a6878df5..f3da46f12009 100644
--- a/net/csync2/Makefile
+++ b/net/csync2/Makefile
@@ -30,9 +30,9 @@ MAN1= csync2.1
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
+CONFIGURE_ENV= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_RC_SUBR= csync2
diff --git a/net/ct/Makefile b/net/ct/Makefile
index b6a39ac5e53f..8c966afc15f0 100644
--- a/net/ct/Makefile
+++ b/net/ct/Makefile
@@ -18,6 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/v6eval/bin/pktbuf:${PORTSDIR}/net/v6eval
USE_PERL5= yes
NO_BUILD= yes
-MAKE_ENV+= "NUTTYPE=host"
+MAKE_ENV+= "NUTTYPE=host"
.include <bsd.port.mk>
diff --git a/net/dante/Makefile b/net/dante/Makefile
index b2c6414fd304..dd5539763bad 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -21,8 +21,8 @@ CONFLICTS= socks5-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \
--with-sockd-conf=${PREFIX}/etc/sockd.conf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
USE_LDCONFIG= yes
diff --git a/net/daq/Makefile b/net/daq/Makefile
index 01c17b0ac04e..ce36fba44ea5 100644
--- a/net/daq/Makefile
+++ b/net/daq/Makefile
@@ -26,7 +26,6 @@ USE_LDCONFIG= yes
USE_BISON= build
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 385ff06a8e2f..fe3bf29d8112 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -26,8 +26,8 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--without-local-zlib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES+= dictd.conf pkg-message
SUB_LIST+= PORTSDIR=${PORTSDIR}
diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile
index 18b2cb38f69f..4bf30ac9f568 100644
--- a/net/easysoap/Makefile
+++ b/net/easysoap/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 8fa212fbada5..a676a5833097 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -29,9 +29,8 @@ INSTALLS_OMF= yes
USE_GNOME= libgnomeui gnomeprefix gnomehack gnomedocutils \
evolutiondataserver intlhack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-pwlib-dir=${LOCALBASE} \
--with-opal-dir=${LOCALBASE}
MAKE_JOBS_SAFE= yes
diff --git a/net/fonulator/Makefile b/net/fonulator/Makefile
index 985f3ba9a86f..a26173a521a9 100644
--- a/net/fonulator/Makefile
+++ b/net/fonulator/Makefile
@@ -14,9 +14,8 @@ MAINTAINER= fjoe@FreeBSD.org
COMMENT= A foneBRIDGE configuration utility
GNU_CONFIGURE= yes
-CONFIGURE_ENV=\
- CPPFLAGS="-I${LOCALBASE}/include ${LIBNET_CPPFLAGS}"\
- LDFLAGS="${LIBNET_LIBS:N-l*}"
+CPPFLAGS+= -I${LOCALBASE}/include ${LIBNET_CPPFLAGS}
+LDFLAGS+= ${LIBNET_LIBS:N-l*}
CONFIGURE_ARGS= --disable-shared
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet\
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 1ce0c3f46535..cd9f5bf9d091 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -22,9 +22,8 @@ USE_OPENSSL= yes
USE_GNOME= gnomehack pkgconfig
USE_LDCONFIG= yes
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 6afd8dcf1ee0..b5dbb1560b6e 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -61,8 +61,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-ogg-libraries=${LOCALBASE}/lib \
--with-ogg-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
CPPFLAGS+= -I${PREFIX}/include
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 46aca3be188f..c8bee626ff8f 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -19,7 +19,7 @@ COMMENT= An enhanced Wide Area Information Server
HAS_CONFIGURE= yes
USE_PERL5_BUILD=yes
CONFIGURE_SCRIPT= Configure
-CONFIGURE_ENV= PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
+CONFIGURE_ENV= PREFIX="${PREFIX}"
CONFIGURE_ARGS= -sde -Dprefix="${PREFIX}" \
-Darchname="${MACHINE_ARCH}-freebsd"
INSTALL_TARGET= install install.man
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 22054e319f66..50e3d875b176 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -26,7 +26,7 @@ USE_GSTREAMER= vorbis
USE_ICONV= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --enable-systray --with-ssl=${OPENSSLBASE}
GCONF_SCHEMAS= g2ipmsg.schemas
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 1ac6c1a7ed7f..392c6fab5a4c 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
USE_BZIP2= yes
USE_GNOME= glib12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USERS= ${PORTNAME}
GROUPS= ${USERS}
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index bc38988baf1e..05b7be98d09e 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -33,9 +33,9 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index f6975cdcd15c..ff8f6c93ebce 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -22,8 +22,8 @@ USE_GSTREAMER= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_ICONS= yes
MAN6= gnome-mud.6
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 54dacf22cd79..de00c1619a4f 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -26,8 +26,8 @@ USE_GETTEXT= yes
INSTALLS_OMF= 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
CFLAGS+= -DHAVE_SOCKADDR_SA_LEN
post-install:
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index c3ed3783e07f..485e8dd48d4d 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -22,8 +22,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libltdl libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=/var
OPTIONS= PYTHON "With PYTHON support" on \
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 408dd88fa9db..4eca54b94f2b 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -26,11 +26,10 @@ USE_OPENLDAP= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE}
-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/net/grdesktop/Makefile b/net/grdesktop/Makefile
index 611a351cce3f..7b7c2c2c6a87 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -22,7 +22,8 @@ USE_GMAKE= yes
USE_GNOME= libgnomeui gnomeprefix gnomehack
GCONF_SCHEMAS= grdesktop.schemas
INSTALLS_OMF= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps
MAN1= grdesktop.1
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index 36a8f916b9d1..9cd72e7a8cad 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -27,7 +27,6 @@ INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 561b68970ead..3ba77388a57b 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -25,8 +25,8 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gtkglext=yes
.include <bsd.port.mk>
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 1fdf88326a8b..b7ad7afeaa7e 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -16,8 +16,8 @@ COMMENT= Fetch listings and books from Project Gutenberg
LIB_DEPENDS= gutenfetch:${PORTSDIR}/devel/libgutenfetch
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
USE_GMAKE= yes
USE_BZIP2= yes
diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile
index 7423c5610a40..46d40a42a6b3 100644
--- a/net/hawknl-devel/Makefile
+++ b/net/hawknl-devel/Makefile
@@ -24,9 +24,8 @@ USE_GMAKE= yes
MAKEFILE= makefile.linux
USE_LDCONFIG= yes
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS= -I${LOCALBASE}/include
-MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/HawkNL1.70
diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile
index 39716c46198f..8c9970bf149b 100644
--- a/net/hawknl/Makefile
+++ b/net/hawknl/Makefile
@@ -20,9 +20,8 @@ USE_GMAKE= yes
MAKEFILE= makefile.linux
USE_LDCONFIG= yes
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS= -I${LOCALBASE}/include
-MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
diff --git a/net/howl/Makefile b/net/howl/Makefile
index f39bd2da4bf6..43e015a78857 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -27,7 +27,6 @@ PLIST_SUB= VERSION="${PORTVERSION}"
CPPFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
MAN8= mDNSResponder.8
diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index 7b0dc4608253..bf65608c268d 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -18,9 +18,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
MAN1= iaxmodem.1
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= pkg-message
USE_RC_SUBR= iaxmodem
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 9e0bbcd8dea1..dad105f907ac 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -16,9 +16,8 @@ COMMENT= TCP/IP traffic logging tool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN5= iplog.conf.5
MAN8= iplog.8
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index dc47f9397358..1f417ccd5fa2 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -19,7 +19,8 @@ COMMENT=An improved WHOIS client capable of selecting server to query
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/jwhois
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 7b911afe561d..703660677170 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -35,7 +35,7 @@ DO_NOT_COMPILE+=kopete lanbrowsing filesharing
CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE}
.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
.endif # defined(DO_NOT_COMPILE)
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile
index 84edb2e2cc25..5dafe9234ce5 100644
--- a/net/keepalived/Makefile
+++ b/net/keepalived/Makefile
@@ -26,7 +26,6 @@ USE_RC_SUBR= keepalived.sh
LDFLAGS+= -lipvs -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-kernel-dir=${LOCALBASE}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
MAN1= genhash.1
MAN5= keepalived.conf.5
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 83709045531e..7727c59b0626 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -19,7 +19,7 @@ USE_QT_VER= 3
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
post-patch:
@${REINPLACE_CMD} -e "s|-O3||g ; \
diff --git a/net/krdesktop/Makefile b/net/krdesktop/Makefile
index 7f827c11e7a4..6bda0fb9389c 100644
--- a/net/krdesktop/Makefile
+++ b/net/krdesktop/Makefile
@@ -21,7 +21,7 @@ USE_KDELIBS_VER=3
NO_WRKSUBDIR= yes
PLIST_FILES= bin/krdesktop
-MAKE_ENV= QTDIR=${QT_PREFIX} \
+MAKE_ENV= QTDIR=${QT_PREFIX} \
KDEDIR=${LOCALBASE} \
MOC=${MOC}
diff --git a/net/libfb/Makefile b/net/libfb/Makefile
index 7f182e5b6f81..4c7d09ef32b7 100644
--- a/net/libfb/Makefile
+++ b/net/libfb/Makefile
@@ -16,9 +16,8 @@ COMMENT= A foneBRIDGE configuration library
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
GNU_CONFIGURE= yes
-CONFIGURE_ENV=\
- CPPFLAGS="${LIBNET_CPPFLAGS}"\
- LDFLAGS="${LIBNET_LIBS:N-l*}"
+CPPFLAGS+= ${LIBNET_CPPFLAGS}
+LDFLAGS+= ${LIBNET_LIBS:N-l*}
CONFIGURE_ARGS= --disable-shared
LIBNET_CONFIG= ${LOCALBASE}/bin/libnet11-config
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index d34f1592dda0..6eccc52d1247 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gconf2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
#.if !defined(WITHOUT_SSL)
#LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 8019b30f33ae..dc41f8af8d8f 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gweather.schemas
diff --git a/net/libmms/Makefile b/net/libmms/Makefile
index 250417560c18..df92c4abc182 100644
--- a/net/libmms/Makefile
+++ b/net/libmms/Makefile
@@ -18,7 +18,7 @@ USE_GETTEXT= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index cdead4c93463..56543f86564b 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -118,7 +118,6 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --without-dag
.else
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.endif
.if defined(LIBPCAP_OVERWRITE_BASE)
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 1d9bc62454af..6c5643091d55 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_CSTD= gnu89
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-shared --disable-trace
USE_LDCONFIG= yes
diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile
index 1ca8dd34ca67..2beff7ed485b 100644
--- a/net/libtrace/Makefile
+++ b/net/libtrace/Makefile
@@ -25,7 +25,7 @@ MAN1= traceanon.1 traceconvert.1 tracefilter.1 tracemerge.1 tracepktdump.1 \
tracereport.1 tracertstats.1 tracesplit.1 tracesplit_dir.1 tracestats.1 \
tracesummary.1
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index f1e322db02dd..1c9b7080e391 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
USE_GNOME= gnomehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-x
OPTIONS= GNUTLS "Adds GnuTLS support" Off \
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index b596d8608ece..920ca02a151b 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gnomeprefix gnomehack libglade2 gconf2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-libnotify
MAKE_JOBS_SAFE= yes
diff --git a/net/linc/Makefile b/net/linc/Makefile
index b18c91bc98b7..bd339495df59 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index c735a8bbd528..660920bdba03 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP
USE_GNOME= gnomehack gnomeprefix gnomepanel eel2 librsvg2 libgnomeui
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= link-monitor-applet.schemas
INSTALLS_OMF= yes
diff --git a/net/linneighborhood/Makefile b/net/linneighborhood/Makefile
index 5cf264462eeb..dd04466c99c4 100644
--- a/net/linneighborhood/Makefile
+++ b/net/linneighborhood/Makefile
@@ -22,11 +22,11 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"\
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
- CC="${CC} -I${LOCALBASE}/include"
+CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include"
# ^
# this was done intentionaly in order to make `configure' pick up libintl.h
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
.include <bsd.port.pre.mk>
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 879d21617985..9399a804d524 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -25,15 +25,14 @@ USE_GNOME= glib20 gnomehack intlhack pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-ipv6 --disable-manual --disable-ewarning \
--disable-strict --disable-video --disable-external-ortp \
--with-osip=${LOCALBASE} --with-gsm=${LOCALBASE}
MAKE_ENV= SUBDIRS="${SUBDIRS}"
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 4393b3a2d229..89260c12e0d0 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -23,9 +23,7 @@ CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-search="${LOCALBASE}" \
--disable-inotify
CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- CFLAGS="${CFLAGS}"
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
USE_RC_SUBR= mediatomb.sh
# --- configurable variables ---
diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile
index 7bc99f114a28..83e4d1cedae5 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -25,7 +25,7 @@ SUB_FILES= pkg-message
OPTIONS= SLP "Enable SLP support via openslp" off
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 17492a7682b5..ceef854f7d43 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -28,7 +28,7 @@ MAN5= miredo-server.conf.5 miredo.conf.5
MAN8= miredo-server.8 miredo.8 miredo-checkconf.8
USE_RC_SUBR= miredo_server miredo
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 59dba10ba8f8..7890c8e2bde7 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -46,9 +46,10 @@ USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-romio --enable-shared \
--docdir=${DOCSDIR}
-CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}" \
+CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" \
PACKAGE=${PORTNAME}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
FFLAGS?= -O2
NOCCACHE= yes
MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index db172caf3648..12a079a118c5 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -18,8 +18,8 @@ COMMENT= Netcat clone with IPv6 support
MAN1= nc6.1
USE_ICONV= yes
GNU_CONFIGURE= yes
-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/net/net6/Makefile b/net/net6/Makefile
index b9c8e8b584ee..80bf9b737ef2 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
@@ -30,8 +29,8 @@ PLIST_SUB+= NLS="@comment "
.else
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
.include <bsd.port.mk>
diff --git a/net/netboot/Makefile b/net/netboot/Makefile
index b6c650fcc92d..07c0a3e1a3ee 100644
--- a/net/netboot/Makefile
+++ b/net/netboot/Makefile
@@ -23,8 +23,8 @@ USE_LDCONFIG= yes
USE_BISON= build
CONFIGURE_ARGS+= --enable-static=no --enable-bootrom=yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="${LIBS} -L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
MAN5= netboot.5 netboot.config.5 netboot.drivers.5 netboot.db.5
MAN8= mknbi-mgl.8 makerom.8 mknbi-dos.8 mknbi-linux.8 nbdbtool.8
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index bd606d7c622f..445d15fe3cf1 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel
USE_GETTEXT= 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
.include <bsd.port.mk>
diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
index 1aec3edcc5de..0fdef46f24c1 100644
--- a/net/nss-pam-ldapd/Makefile
+++ b/net/nss-pam-ldapd/Makefile
@@ -41,8 +41,8 @@ IGNORE= problems with nss/libc TLS
EXTRA_PATCHES+= ${FILESDIR}/rtld_nss__nslcd.c
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-nslcd-pidfile=${NSLCD_PIDFILE} \
--with-nslcd-socket=${NSLCD_SOCKET} \
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index 716bac5bd20a..306c16b4d9d0 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -28,8 +28,8 @@ USE_OPENLDAP= yes
OPTIONS= LCLASS "Enable login classes via the loginClass attribute" on
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
CONFIGURE_ARGS= --with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 78298e68c87f..58dfbd71246c 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -80,10 +80,10 @@ CONFIGURE_ARGS+= --enable-i18n \
.if defined(WITH_XMLDUMP)
LIB_DEPENDS+= gdome.8:${PORTSDIR}/textproc/gdome2
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \
+CPPFLAGS+= -I${LOCALBASE}/include/libxml2 \
-I${LOCALBASE}/include/libxml2/libxml \
-I${LOCALBASE}/include/libgdome \
- -I${LOCALBASE}/include/glib-2.0"
+ -I${LOCALBASE}/include/glib-2.0
.endif
.if ${OSVERSION} < 700000
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 425de0d60a35..378cf146967a 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_ARGS= -j`${SYSCTL} -n hw.ncpu`
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= PORTVERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 3ec899cc98ef..d57c9442e402 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -30,8 +30,8 @@ USE_LDCONFIG= yes
#MAKE_JOBS_SAFE= yes
CXXFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= ZRTP "Enable ZRTP protocol support" off \
JAVA "Enable Java JNI support" off \
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index fa860d159c2e..7add8bff782a 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -28,8 +28,9 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
ALL_TARGET= optshared
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+CONFIGURE_ENV+= BUILDTIME="YES"
+CPPFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= BUILDTIME="YES"
.include <bsd.port.pre.mk>
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 6c333211a927..2df83f34da03 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -379,9 +379,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \
LDFLAGS+= -L${LOCALBASE}/lib
#LIBS+= ${PTHREAD_LIBS}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="${LIBS}"
+CONFIGURE_ENV+= LIBS="${LIBS}"
.if defined(CLIENT_ONLY)
.include "${FILESDIR}/manpages"
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index e8e60fb368e2..c1f63f58c8d0 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -452,9 +452,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \
LDFLAGS+= -L${LOCALBASE}/lib
#LIBS+= ${PTHREAD_LIBS}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="${LIBS}"
+CONFIGURE_ENV+= LIBS="${LIBS}"
.if defined(CLIENT_ONLY)
.include "${FILESDIR}/manpages"
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index 1239cfbcea90..9b47d0aa5b74 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= ccgnu2-1.7.0:${PORTSDIR}/devel/commoncpp
GNU_CONFIGURE= yes
USE_PYTHON= yes
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
PLIST_FILES= bin/panoptis bin/mail.py bin/pview.py bin/speed.py
do-install:
diff --git a/net/pktanon/Makefile b/net/pktanon/Makefile
index 6a5bc80f4097..a3434f320b87 100644
--- a/net/pktanon/Makefile
+++ b/net/pktanon/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \
xerces-c:${PORTSDIR}/textproc/xerces-c2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
post-install:
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 92271dc27afa..952a719d7fb8 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
-MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}"
USE_RC_SUBR= pptpd.sh
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index 397c0ff4486d..68bad075dc7a 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
#
# basic configure args
#
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --prefix=${PREFIX} --with-libwrap=/usr/lib --with-regex \
--localstatedir=/var/run \
--enable-warnings --enable-so-linger \
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index e5289651bf31..15725ec05ce5 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -50,9 +50,9 @@ CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -fstack-protector
.endif
CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+CONFIGURE_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
LIBTOOL_VERSION=${LIBTOOL_VERSION}
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(ENABLE_USER)
ENABLE_USER=quagga
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 2f5219cc2c76..3d670ccb1eab 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -53,8 +53,6 @@ CONFIGURE_ARGS+= --enable-64-bit
LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PLIST_SUB+= POPT=''
CONFIGURE_ARGS+= --with-popt
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index a06f274b075f..41d84458b26f 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -52,8 +52,6 @@ CONFIGURE_ARGS+= --enable-64-bit
LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PLIST_SUB+= POPT=''
CONFIGURE_ARGS+= --with-popt
diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile
index 4059c203e865..7513a3e8c664 100644
--- a/net/remmina-applet/Makefile
+++ b/net/remmina-applet/Makefile
@@ -23,8 +23,8 @@ MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 gtk20 gnomepanel
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk
index b3bddae93615..6aa1b7e77816 100644
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@@ -14,8 +14,7 @@ USE_GMAKE= yes
USE_GNOME= glib20 gtk20
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS+=--disable-nx --disable-rdp --disable-ssh --disable-telepathy \
--disable-vnc --disable-xdmcp --disable-nls
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index d3a9399e3ada..211fd8cdf79e 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -25,8 +25,7 @@ USE_GMAKE= yes
USE_GNOME= glib20 gtk20 desktopfileutils
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
SUB_FILES= pkg-message
LICENSE= GPLv2
diff --git a/net/rexx-sock/Makefile b/net/rexx-sock/Makefile
index 6d5ea8e7c49c..aad8c2cea901 100644
--- a/net/rexx-sock/Makefile
+++ b/net/rexx-sock/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS= rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-rexx=regina
MAKE_ARGS= INSTALL="${INSTALL}"
USE_LDCONFIG= yes
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 04b22c4b7d9c..d6f0302bf6f2 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -75,7 +75,7 @@ CFLAGS+= -I${LOCALBASE}/include
USE_ICONV= yes
CONFIGUREDCFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
+CONFIGURE_ENV+= CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
.else
CONFIGURE_ARGS+= --disable-iconv
CONFIGURE_ENV+= ac_cv_search_libiconv_open=no
@@ -94,8 +94,8 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff
.if defined(WITH_POPT_PORT)
LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
.else
CONFIGURE_ARGS+= --with-included-popt
.endif
diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile
index 8e88a5f73760..1eff737b8214 100644
--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@@ -16,8 +16,8 @@ COMMENT= A high-performance RTP proxy server for the SIP Express Router (SER)
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
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= --mandir=${LOCALBASE}/man
MAN8= rtpproxy.8
diff --git a/net/samba34/Makefile b/net/samba34/Makefile
index e1d1915cf87f..7cbcfe437e22 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -68,7 +68,6 @@ CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
# pkg-config is used to find talloc
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 2c89c9ad16ef..cac62b4a4e26 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -74,8 +74,7 @@ CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
# pkg-config is used to find talloc, tevent and tdb
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
diff --git a/net/samba4-devel/Makefile b/net/samba4-devel/Makefile
index 9ddd6e2ef8fe..49fb7067a579 100644
--- a/net/samba4-devel/Makefile
+++ b/net/samba4-devel/Makefile
@@ -43,7 +43,6 @@ USE_AUTOTOOLS= autoconf autoheader
# Flags
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
# Directories
VARDIR= /var
SAMBA_LOGDIR= ${VARDIR}/log/${PORTNAME}
diff --git a/net/ser/Makefile b/net/ser/Makefile
index d1341c28d9b1..1b32bfc76240 100644
--- a/net/ser/Makefile
+++ b/net/ser/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GMAKE= yes
USE_RC_SUBR= ser
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
NOPRECIOUSMAKEVARS= yes
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index a572f4f2e838..a3207eeb93f9 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -22,14 +22,13 @@ GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= serveez.1 serveez-config.1
INFO= serveez serveez-api
-CPPFLAGS= `${GUILE_CONFIG} compile`
-LDFLAGS= `${GUILE_CONFIG} link`
+CPPFLAGS+= `${GUILE_CONFIG} compile`
+LDFLAGS+= `${GUILE_CONFIG} link`
post-patch:
@${REINPLACE_CMD} -e 's|-release||g' \
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 111649012983..70034acad481 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+= --disable-asm
.endif
.if defined(WITH_PTHREADS)
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
.else
CONFIGURE_ARGS+= --without-pthreads
.endif
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index f914a9d5811f..bcb5c3ff682d 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -30,7 +30,7 @@ USE_RC_SUBR= silcd
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
--sysconfdir=${PREFIX}/etc/${PORTNAME} \
--with-helpdir=share/${PORTNAME}/help \
diff --git a/net/sobby/Makefile b/net/sobby/Makefile
index dd072e15a4f7..b9c0401ea5cf 100644
--- a/net/sobby/Makefile
+++ b/net/sobby/Makefile
@@ -21,15 +21,14 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
glibmm-2.4.1:${PORTSDIR}/devel/glibmm
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-zeroconf
MAKE_JOBS_SAFE= yes
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/${PORTNAME}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index f6b7356fd632..0287e18b3986 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -23,7 +23,6 @@ USE_GNOME= pkgconfig glib20 gnomehack
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
post-patch:
@${REINPLACE_CMD} -e 's|\-O2||' ${WRKSRC}/configure
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index 7a37b626366b..8b38f9238143 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -23,7 +23,7 @@ OPTIONS= BIG5 "Big5 support" off
CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
--libdir=${LOCALBASE}/lib \
--prefix=${PREFIX}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" ac_cv_file__dev_ptmx=no
+CONFIGURE_ENV= ac_cv_file__dev_ptmx=no
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_GMAKE= yes
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 5d45de2b2804..4add1a9d04c6 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -27,7 +27,8 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
ALL_TARGET= trafshow
MAN1= trafshow.1
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 9febe86c06ec..911c88cb444d 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} \
--sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= trickle.1
MAN5= trickled.conf.5
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index d97277d058cc..678c8895f35b 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -29,7 +29,7 @@ CONFLICTS= tightvnc-[0-9]* vnc-[0-9]*
.ifdef(TRIDIAVNC_BASE)
PREFIX=${TRIDIAVNC_BASE}
-MAKE_ENV+= DESTDIR=${TRIDIAVNC_BASE}
+MAKE_ENV+= DESTDIR=${TRIDIAVNC_BASE}
.endif
.include <bsd.port.pre.mk>
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 4d18f65ed1da..c82696ed78b2 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -21,9 +21,9 @@ USE_GNOME= gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= tsclient.1
PORTDOCS= COPYING NEWS README
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 22a10a1a30d1..c8c048c1c629 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -35,8 +35,7 @@ USE_QT_VER= 3
OPTIONS= KDE "Compile with kde features" off
CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE} \
-CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \
- CFLAGS="${CFLAGS}"
+CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}"
MAKE_ENV= QTDIR=${QT_PREFIX}
SUB_FILES= pkg-message
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index b43d0626903e..f0c7b5b28227 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -24,13 +24,12 @@ USE_GNOME= gnomehack
USE_ICONV= yes
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/net/uplog/Makefile b/net/uplog/Makefile
index 0a7833146212..13ab97b2b21d 100644
--- a/net/uplog/Makefile
+++ b/net/uplog/Makefile
@@ -14,8 +14,8 @@ MAINTAINER= jadawin@FreeBSD.org
COMMENT= UDP-based ping programm
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
PORTDOCS= README
PLIST_FILES= bin/uplog
diff --git a/net/ushare/Makefile b/net/ushare/Makefile
index 6d21053103ba..8ced4eadac9a 100644
--- a/net/ushare/Makefile
+++ b/net/ushare/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_GETTEXT= yes
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}
diff --git a/net/vde/Makefile b/net/vde/Makefile
index cff10a11bb51..577442e8216f 100644
--- a/net/vde/Makefile
+++ b/net/vde/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
CFLAGS+= ${CPPFLAGS} -fPIC
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
MAN1= dpipe.1 slirpvde.1 vdetaplib.1 vdeq.1 vde_plug.1 vde_switch.1
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 1db7e8850b67..5cd9562bb118 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -32,7 +32,7 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --enable-avahi --enable-applet -enable-ssh
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= vinagre.schemas
diff --git a/net/vino/Makefile b/net/vino/Makefile
index c4d2501f1abc..1c5d00877124 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
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= vino-server.schemas
diff --git a/net/whois/Makefile b/net/whois/Makefile
index d666632ab5a6..dde738952271 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -23,7 +23,6 @@ USE_PERL5_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_ARGS= OPTS=""
MAN1= mwhois.1 mkpasswd.1
diff --git a/net/wire/Makefile b/net/wire/Makefile
index 782845f4a74c..bdde35a17e7d 100644
--- a/net/wire/Makefile
+++ b/net/wire/Makefile
@@ -18,9 +18,8 @@ COMMENT= Wire is a screen-oriented command line Wired client
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
-MAKE_ENV= CPPFLAGS=${CPPFLAGS}
USE_GMAKE= yes
USE_OPENSSL= yes
diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile
index 3c5958a10ce6..c33e64bf32df 100644
--- a/net/wmwifi/Makefile
+++ b/net/wmwifi/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_XORG= x11 xpm
USE_GMAKE= yes
-CONFIGURE_ENV+= "CPPFLAGS=-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= bin/wmwifi
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 5c4672d93014..873810d3bf89 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -17,9 +17,8 @@ COMMENT= Tool to wake up Wake-On-LAN compliant computers
GNU_CONFIGURE= yes
USE_PERL5_BUILD= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS= --disable-nls
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 20485d2ae9ba..2cd3d991d1ca 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -31,7 +31,7 @@ USE_ICONV= yes
USE_GETTEXT= yes
.endif
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= x11vnc.1
PORTDOCS= AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 1e18be7bad76..79e60992d2b8 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
USE_XORG= xt x11 ice xaw xmu
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="`${LIBNET_CONFIG} --libs`"
+LDFLAGS+= `${LIBNET_CONFIG} --libs`
CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \
-I/usr/include
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index 59f3fdd4798c..8ec3577efc58 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
CONFIGURE_ARGS= --program-transform="s|^|xre-|"
PORTDOCS= AUTHORS ChangeLog NEWS README
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index e3714517bb69..2f49486472ba 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -25,9 +25,8 @@ GNU_CONFIGURE= yes
USE_RC_SUBR= xrdp
CONFIGURE_ARGS= --localstatedir=/var
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile
index fae2c8dc2601..495e68b526a5 100644
--- a/net/yate-devel/Makefile
+++ b/net/yate-devel/Makefile
@@ -31,8 +31,8 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-fdsize \
--mandir=${LOCALBASE}/man
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
PWLIBDIR=${LOCALBASE}/share/pwlib \
diff --git a/net/yate/Makefile b/net/yate/Makefile
index cdf984f78b04..9bc4fb4e3c38 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -30,14 +30,14 @@ WRKSRC= ${WRKDIR}/yate
CONFIGURE_ARGS= --without-fdsize \
--with-zlib=/usr
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
PWLIBDIR=${LOCALBASE}/share/pwlib \
OPENH323DIR=${LOCALBASE}/share/openh323 \
- OSVERSION=${OSVERSION} \
+ OSVERSION=${OSVERSION}
MAN8= yate-config.8 yate.8
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 91c959984101..1cd3b1a1d4bd 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -20,9 +20,10 @@ USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
LIBTOOLFILES= configure libmutt/configure
-CONFIGURE_ENV= glibpath="${GLIB_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= glibpath="${GLIB_CONFIG}"
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 93a4f55cd8f2..b36a8eb6bc65 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -23,9 +23,9 @@ USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/db44 ${PTHREAD_CFLAGS}" \
- CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include/db44" \
- LDFLAGS="-L${LOCALBASE}/lib/db44 ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib/db44 ${PTHREAD_LIBS}
+CFLAGS+= -I${LOCALBASE}/include/db44 ${PTHREAD_CFLAGS}
+CXXFLAGS+= -I${LOCALBASE}/include/db44
post-install:
.if defined(NOPORTDOCS)
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index e52315b52704..c8b1b0413830 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++
USE_AUTOTOOLS= automake autoheader autoconf
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
USE_RC_SUBR= ${PORTNAME}.sh
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index f94781a2e5a5..cfe52f6f4ff8 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -30,8 +30,8 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
--with-rc-dir=/var/spool/newsstar/lib \
--with-incoming-dir=/var/spool/newsstar/incoming
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
.if defined(NOPORTDOCS)
INSTALL_TARGET= install-am
diff --git a/news/newsx/Makefile b/news/newsx/Makefile
index 57bf1fb90338..c79fe136cb8c 100644
--- a/news/newsx/Makefile
+++ b/news/newsx/Makefile
@@ -30,7 +30,7 @@ CONFLICTS= leafnode-1.9.*
.if !defined(WITH_CNEWS)
.if !defined(WITHOUT_INN_2-X)
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/news/include"
+CPPFLAGS+= -I${LOCALBASE}/news/include
.endif
.endif
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 23f772c242eb..fbb01f6fbe6d 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -45,7 +45,6 @@ CONFIGURE_ARGS+= --with-authinfo-ldap
CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib
AUTHINFO_EXT+= authinfo_ldap.ext
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.endif
CONFIGURE_ARGS+= --program-transform-name=''
diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index 8b624e38505b..821593515152 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-configfile=${LOCALBASE}/etc/noffle.conf \
--with-usersfile=${LOCALBASE}/etc/noffle.users
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
SPOOL_DIR= /var/spool/noffle
PLIST_SUB+= SPOOL_DIR=${SPOOL_DIR}
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 91ef8271b29f..9891cc999918 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -21,9 +21,10 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
sigc-2:${PORTSDIR}/devel/libsigc++20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
- LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV= LOCALBASE="${LOCALBASE}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_GMAKE= yes
OPTIONS= PARCHECK "Enable autopar/parcheck (Requires libpar2)" On
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 394e79896abd..514c37dce260 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack intlhack
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
+LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex
OPTIONS= GTKSPELL "Enable spell checking support (gtk+2 only)" on \
GTK3 "Build with gtk+3 based UI instead of gtk+2" off
diff --git a/news/s-news/Makefile b/news/s-news/Makefile
index 267f868b8b45..77833b2b5079 100644
--- a/news/s-news/Makefile
+++ b/news/s-news/Makefile
@@ -21,8 +21,8 @@ CONFLICTS= nntp-[0-9]*
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-confdir=${PREFIX}/etc/s-news \
--with-spooldir=/var/spool/s-news
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/news/suck/Makefile b/news/suck/Makefile
index aa7bf9c5f2e1..d44085e96879 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -26,7 +26,6 @@ EX_SCRIPTS= get.news.generic get.news.inn perl_kill.pl perl_xover.pl \
post_filter.pl put.news put.news.pl put.news.sm put.news.sm.pl
EX_DATA= suckkillfile.sample sucknewsrc.sample suckothermsgs.sample
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
MAKE_ENV+= CHKHISTORY=chkhistory_db.o
.if defined(NEWSBIN) && !defined(SUCK_WITH_INN)
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 348a01668b1d..27b20e679f5e 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=--with-nntp-default-server=news \
MAKE_ARGS+= MAKE=${GMAKE}
CFLAGS+= -DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\"
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
+LDFLAGS+= -L${LOCALBASE}/lib
ALL_TARGET= build
MAN1= tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1 tinurl_handler.pl.1
MAN5= tin.5 tin_mbox.5 tin_mmdf.5
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index 8496462fc5f2..7e5d2a8b3204 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -17,12 +17,11 @@ COMMENT= A free (GPL) encoder and decoder for the yEnc Usenet file format
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ydecode.1 yencode.1 ypost.1
MAN5= ypostrc.5
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index fb66ad334424..2d4c0ea24268 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -25,8 +25,8 @@ USE_GNOME= gnomeprefix gnomehack libgnome
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 7a75eed3fb47..8643c2af4288 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool
INSTALLS_OMF= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pisock=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gpilot-install-file.1
GCONF_SCHEMAS= pilot.schemas
diff --git a/palm/jpilot-picsnvideos/Makefile b/palm/jpilot-picsnvideos/Makefile
index 6ceb558af0a5..93ac5151c354 100644
--- a/palm/jpilot-picsnvideos/Makefile
+++ b/palm/jpilot-picsnvideos/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV= LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+= -L${PREFIX}/lib
PORTDOCS= README AUTHORS
PLIST_FILES= lib/jpilot/plugins/libpicsnvideos.la \
lib/jpilot/plugins/libpicsnvideos.so
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index d58a7eaa7f78..7356788733f7 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehier
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE}
LICENSE= GPLv2
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 7c697483cf6d..f3e70de5ecf5 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -23,7 +23,6 @@ USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include
CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits --enable-xsltproc
-CONFIGURE_ENV+= CFLAGS="${CFLAGS:S/-Werror//}" # clear -Werror from CFLAGS
USE_LDCONFIG= yes
OPTIONS= PNG "build with png support" off \
@@ -43,7 +42,7 @@ CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS
LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
. endif
CONFIGURE_ARGS+=--enable-libusb
-CONFIGURE_ENV+=LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -lusb"
+LDFLAGS+= -L${PREFIX}/lib -lusb
.if defined(WITHOUT_THREADS)
IGNORE= cannot be built: USB support requires THREADS turned on. Please reconfigure using 'make config'
diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index 09d0e8b6cf28..f33c9bbc2d03 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -16,7 +16,7 @@ COMMENT= PPM to Pilot bitmap converter
LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm
-MAKE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDLIBS=-lnetpbm
post-patch:
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index a60fe3d890f5..e93977d8a12b 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -26,8 +26,6 @@ USE_GNOME= gnomeprefix gnomehack gvfs
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
GVFS_PORTDIR= ${PORTSDIR}/devel/gvfs
GVFS_WRKSRC_CMD=cd ${GVFS_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 3603230d8619..e381f8759755 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -31,8 +31,6 @@ INSTALLS_ICONS= yes
GCONF_SCHEMAS= ${PORTNAME}.schemas
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
SUB_FILES= pkg-message
MAN1= ${PORTNAME}.1
diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile
index 17db3ed03e45..091d27312968 100644
--- a/polish/ekg/Makefile
+++ b/polish/ekg/Makefile
@@ -26,9 +26,9 @@ CONFIGURE_ARGS+=--disable-shared \
--without-libungif \
--without-libjpeg
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
+CFLAGS+= -I${LOCALBASE}/include
OPTIONS= ASPELL "Build with ASPELL support" off \
OPENSSL "Build with OPENSSL support" on
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index ec2c8131af47..c894e56447c4 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-shared \
--without-gif \
--without-libjpeg
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 2f7eb61559ec..b65697d741a2 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -46,8 +46,8 @@ CONFIGURE_ARGS= --disable-esdtest \
--without-perl \
--without-remote
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= TLEN "Enable Tlen.pl network plugin" off \
JABBER "Enable Jabber loudmouth plugin" off \
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index f4ac086f2f9b..4d65ab5547ed 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= tlen.1:${PORTSDIR}/polish/libtlen
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_XORG= xscrnsaver
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/TleenX2-${PORTVERSION}
MAN1= tleenx2.1
diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile
index c50afa0ccbde..8fe98ebb7cf1 100644
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@@ -33,8 +33,8 @@ GCONF_SCHEMAS= gnome-packagekit.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
MAN1= gpk-application.1 gpk-backend-status.1 gpk-install-local-file.1 \
gpk-install-mime-type.1 gpk-install-package-name.1 \
diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile
index 3502723cfe51..5c6bd661e234 100644
--- a/ports-mgmt/kpackagekit/Makefile
+++ b/ports-mgmt/kpackagekit/Makefile
@@ -26,7 +26,7 @@ USE_QT_VER= 4
QT_COMPONENTS= moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
USE_CMAKE= yes
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 54a8d60c6528..c0d07923c21f 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -32,10 +32,8 @@ USE_ICONV= yes
USE_LDCONFIG= yes
USE_PYTHON_BUILD= 2.5+
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lexecinfo
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
CONFIGURE_ARGS+=--with-security-framework=polkit \
--localstatedir=/var \
--disable-gtk-doc \
diff --git a/ports-mgmt/portdowngrade/Makefile b/ports-mgmt/portdowngrade/Makefile
index 59fda3bc7b8c..bda285aab145 100644
--- a/ports-mgmt/portdowngrade/Makefile
+++ b/ports-mgmt/portdowngrade/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
POPT_INCLUDE= `pkg_info -xL ^popt | ${GREP} popt.h | ${SED} -e 's?/popt.h??'`
POPT_LIB= `pkg_info -xL ^popt | ${GREP} libpopt.a | ${SED} -e 's?/libpopt.a??'`
-CONFIGURE_ENV= CPPFLAGS="-I${POPT_INCLUDE}" \
- LIBS="-lpopt -L${POPT_LIB}"
+CONFIGURE_ENV= LIBS="-lpopt -L${POPT_LIB}"
+CPPFLAGS+= -I${POPT_INCLUDE}
.if defined(DEFAULT_CVS_SERVER)
CONFIGURE_ARGS+= --enable-default-server=${DEFAULT_CVS_SERVER}
.endif
diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index 1b30f222902d..ff811ddac30c 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKEFILE= GNUmakefile
ALL_TARGET= # empty
MAKE_JOBS_UNSAFE= yes
@@ -27,8 +26,8 @@ MAKE_JOBS_UNSAFE= yes
MAN1= catdvi.1
PLIST_FILES= bin/catdvi
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/catdvi ${PREFIX}/bin
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 4f43248d7ec1..59b42f7279ad 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -49,8 +49,8 @@ CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include" \
--with-frontend=qt \
--program-prefix="${PKGNAMEPREFIX}"
-CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
-CFLAGS= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
MAN1= ${PKGNAMEPREFIX}lyx.1 ${PKGNAMEPREFIX}tex2lyx.1 ${PKGNAMEPREFIX}lyxclient.1
DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index cb9c4905a4ad..64f6944b49c3 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -23,10 +23,10 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CFLAGS+= ${PTHREAD_CFLAGS}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DSOFLAGS= -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib ${LDFLAGS}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DSOFLAGS="${DSOFLAGS}"
+CONFIGURE_ENV= DSOFLAGS="${DSOFLAGS}"
CONFIGURE_ARGS+= --localstatedir=/var \
--disable-slp \
--disable-gssapi \
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index 88b2ffb34e9f..66ee929cb9f1 100644
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@@ -17,6 +17,8 @@ COMMENT= CUPS backend for Canon USB over IP protocol
LIB_DEPENDS= cupsimage.2:${PORTSDIR}/print/cups-base
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lcompat"
+CONFIGURE_ENV= LIBS="-lcompat"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 2ef974c8e2ec..03467b2f783b 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -23,6 +23,7 @@ USE_GMAKE= yes
USE_GNOME= intlhack gtk20
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/libs"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/libs
.include <bsd.port.mk>
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index 39493ff6734a..666106ba4140 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -37,8 +37,8 @@ USE_GMAKE= yes
# We just need the ghostscript fonts, nothing more
USE_GHOSTSCRIPT_RUN= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --without-x --with-gs=espgs
MAKE_ARGS= CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \
DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev"
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 6454c467648e..1120cd9af5b8 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -62,7 +62,8 @@ WITH_FREETYPE_SRC= --disable-freetype --without-freetype-bytecode \
CONFIGURE_ARGS= ${WITH_MULTILAYER} --enable-devicetables ${WITH_FREETYPE_SRC} \
--enable-pasteafter --enable-tilepath
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 879f40cc184f..68594dd42ffb 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -27,9 +27,10 @@ CONFIGURE_ENV= ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
ac_cv_path_PPR=${LOCALBASE}/lib/ppr \
ac_cv_path_PPR_INTERFACES=${LOCALBASE}/lib/ppr/interfaces \
ac_cv_path_PPR_LIB=${LOCALBASE}/lib/ppr/lib \
- ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= CUPS_IMAGE "Install cups image utilities" on \
A2PS_A4 "Install a2ps convertor (A4)" on \
diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index a2ce10fe7896..fde93e169aa2 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_FREETYPE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1/freetype \
- -I${LOCALBASE}/include" \
- SPOOLER="/usr/bin/lpr" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= SPOOLER="/usr/bin/lpr"
+CPPFLAGS+= -I${LOCALBASE}/include/freetype1/freetype \
+ -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
--with-libungif
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 44aa8a3cdcbd..04e4457011b2 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
USE_GETTEXT= yes
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= ggv.schemas
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 21e6074409cc..4bb40979b45f 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -41,9 +41,10 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \
XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
EXTRALIBS="${EXTRALIBS}"
MAKE_JOBS_UNSAFE= yes
-CONFIGURE_ENV= ${MAKE_ENV} \
- CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
- LDFLAGS="${XLDFLAGS}"
+CONFIGURE_ENV= ${MAKE_ENV}
+
+CPPFLAGS+= -DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+LDFLAGS+= ${XLDFLAGS}
CONFIGURE_ARGS= --disable-compile-inits \
--with-ijs
PLIST_SUB= GS_VERSION="${PORTVERSION}"
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 881f974adfe3..1db6fd6d4d03 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -46,15 +46,15 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \
XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
EXTRALIBS="${EXTRALIBS}" \
SOC_LOADER="dxmainc.c"
-CONFIGURE_ENV= ${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= ${MAKE_ENV}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-compile-inits \
--enable-contrib \
--enable-dynamic \
--with-ijs \
--with-jasper \
--with-drivers=""
-CPPFLAGS= -DUPD_SIGNAL=0 -I. \
+CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
-I${WRKSRC}/jasper/src/libjasper/include \
-I${LOCALBASE}/include/libpng \
-I${LOCALBASE}/include
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 1536e1666c90..9f742fe2922a 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -50,15 +50,15 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS} -g" \
XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
EXTRALIBS="${EXTRALIBS}" \
SOC_LOADER="dxmainc.c"
-CONFIGURE_ENV= ${MAKE_ENV} CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= ${MAKE_ENV}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-compile-inits \
--enable-contrib \
--enable-dynamic \
--with-ijs \
--with-jasper \
--with-drivers=""
-CPPFLAGS= -DUPD_SIGNAL=0 -I. \
+CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
-I${WRKSRC}/lcms/include \
-I${WRKSRC}/jasper/src/libjasper/include \
-I${LOCALBASE}/include/libpng \
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index c1c56b8ecbe4..46ac3ff33a5a 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -29,8 +29,8 @@ USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 7fcf70bb59ab..ea38c712029d 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
@${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 5a371bedae6c..05dbe3fc0cf5 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -25,7 +25,6 @@ USE_AUTOTOOLS= automake:env
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
MAN1= gtklp.1 gtklpq.1
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index dfa272ff1a62..d59d4ad8e72e 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -23,12 +23,11 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include
-LDFLAGS= -L${LOCALBASE}/lib -L${PREFIX}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib
.include <bsd.port.pre.mk>
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index bb5d6a505c7b..bdeca88d63c3 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -21,13 +21,13 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
WRKSRC= ${WRKDIR}/${DISTNAME}/sources
MAKE_ENV= DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" \
- PREVIEWER="${PREVIEWER}"
+ PREVIEWER="${PREVIEWER}"
MAN1= hp2xx.1
INFO= hp2xx
-CPPFLAGS= -DUNIX -I${LOCALBASE}/include
-LDFLAGS= -lm -L${LOCALBASE}/lib -ltiff -lpng -lz
+CPPFLAGS+= -DUNIX -I${LOCALBASE}/include
+LDFLAGS+= -lm -L${LOCALBASE}/lib -ltiff -lpng -lz
.if defined(WITHOUT_X11)
PKGNAMESUFFIX= -nox11
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index c99c18fc6482..0b3b301aa01c 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS= --disable-dependency-tracking
USE_GHOSTSCRIPT_RUN= yes
WANT_PERL= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= CUPS "install support for cups" on \
FOOMATIC "install foomatic-rip and ppd files" on
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 80fd4429498d..649a4b14a5bc 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -42,7 +42,6 @@ CONFIGURE_ARGS= --enable-foomatic-ppd-install \
--with-mimedir=${PREFIX}/etc/cups \
--with-docdir=${DOCSDIR} \
--with-drvdir=${PREFIX}/libexec/cups/driver
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 47602ff4d319..ce38fb9caf07 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gnomehack intlhack ltverhack glib20
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 60eea57b7ee1..17c37748b5e7 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -30,8 +30,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION} \
LIBVERSION=2.2
diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index 93016235bbc6..02c048da6bca 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -20,7 +20,7 @@ USE_XORG= x11 xt xaw xmu
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 4c9e1d04520a..adff55787987 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -19,6 +19,7 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack gnomeprefix ltverhack
USE_GHOSTSCRIPT=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/print/lyx/Makefile b/print/lyx/Makefile
index 159f4df4118e..f0f89f8b894f 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -34,8 +34,8 @@ QT_COMPONENTS= corelib gui moc_build uic_build rcc_build
USE_PYTHON= yes
USE_PERL= yes
GNU_CONFIGURE= yes
-CPPFLAGS= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --without-included-boost \
--without-included-mythes \
--with-libiconv-prefix=${LOCALBASE} \
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 2416a97127b9..a4c965c3ea80 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=--without-aiksaurus
LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33
CONFIGURE_ARGS+= --with-frontend=qt
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
+LDFLAGS+= ${PTHREAD_LIBS}
RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
.else
BROKEN= Does not work with the latest xforms version
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index f316dfb3ffc8..c093add8e3a3 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -35,8 +35,8 @@ QT_COMPONENTS= gui moc_build uic_build rcc_build
USE_PYTHON= yes
USE_PERL= yes
GNU_CONFIGURE= yes
-CPPFLAGS= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-frontend=qt4 \
--without-included-boost \
--without-included-gettext \
diff --git a/print/panda/Makefile b/print/panda/Makefile
index ee0a1a0c1a8c..73cbc9159c23 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -28,13 +28,12 @@ USE_GNOME= gnomehack pkgconfig
USE_BDB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-berkeley-db
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
index cb2553104140..43fa66ed5784 100644
--- a/print/pips800/Makefile.pips
+++ b/print/pips800/Makefile.pips
@@ -95,8 +95,8 @@ PLIST_SUB= PRTYPE=${PRTYPE} \
.include <bsd.port.pre.mk>
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if ${PIPS_MAJOR} >= 2
CONFLICTS= pips*-2.*
USE_RC_SUBR= yes
@@ -129,7 +129,6 @@ USE_ICONV= yes
LDFLAGS+= ${PTHREAD_LIBS}
CPPFLAGS+= ${PTHREAD_CFLAGS}
.endif
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ENV+= SED="${SED}"
LIB_FILE= lib${PRT_MODEL:L}.so
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index bee616fa51e1..b7cb9910d558 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= gnomehack intlhack pkgconfig
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
USE_LDCONFIG= yes
OPTIONS= EXAMPLES "Install additional examples" On \
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 335bc54ba73b..2d342d464ae4 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client
CFLAGS+= -I${LOCALBASE}/include -DVERSION=\\\"${PORTVERSION}\\\"
LDFLAGS+= -L${LOCALBASE}/lib -liconv
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
USE_BZIP2= yes
USE_ICONV= yes
USE_PYDISTUTILS= yes
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index ccc887672962..9f07b114a8f8 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -33,7 +33,8 @@ USE_PYTHON= 2.6+
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= pygtk2
MAN1= system-config-printer-applet.1 system-config-printer.1
PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//}
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index f7286f281567..426e34aaa2a4 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -49,8 +49,8 @@ CONFIGURE_ARGS= --disable-multiplatform \
--without-xdvik --without-oxdvik
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+CFLAGS+= -I${LOCALBASE}/include
PKGMESSAGE= ${WRKDIR}/pkg-message
CONFLICTS= ja-ptex-base-[0-9]* latex2e-[0-9]* \
tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 65a5804a3e59..d8d20b182030 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -29,8 +29,8 @@ MAKE_JOBS_SAFE= yes
MAKE_ARGS= TEXMF=${PREFIX}/${TEXMF}
CONFIGURE_ARGS= --without-included-gettext
-CPPFLAGS= -I${LOCALBASE}/lib
-LDFLAGS= -L${LOCALBASE}/lib -lintl
+CPPFLAGS+= -I${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
INFO= ${PORTNAME} info-stnd info
MAN1= info.1 infokey.1 install-info.1 makeinfo.1 texi2dvi.1 \
diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile
index 301b1af3aacd..8c205ee35a6b 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -18,7 +18,7 @@ COMMENT= Print program listings on postscript printer
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
MAN1= trueprint.1
INFO= trueprint
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 27d4dcc832ea..0adb4163a0e9 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -25,9 +25,9 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \
MAN1= ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
-CPPFLAGS= `pkg-config --cflags freetype2` \
+CPPFLAGS+= `pkg-config --cflags freetype2` \
-I${LOCALBASE}/include -DUSE_FREETYPE
-LDFLAGS= `pkg-config --libs freetype2` \
+LDFLAGS+= `pkg-config --libs freetype2` \
-L${LOCALBASE}/lib -lm
.include <bsd.port.mk>
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
index edfa3efb0b1a..b910c9b4e05e 100644
--- a/print/ttftot42/Makefile
+++ b/print/ttftot42/Makefile
@@ -16,12 +16,11 @@ COMMENT= TrueType to Type42 font converter
USE_FREETYPE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/ttftot42
-CPPFLAGS= -I${LOCALBASE}/include/freetype1/freetype \
+CPPFLAGS+= -I${LOCALBASE}/include/freetype1/freetype \
-I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/print/wprint/Makefile b/print/wprint/Makefile
index fc08d8784019..3960f2c568e2 100644
--- a/print/wprint/Makefile
+++ b/print/wprint/Makefile
@@ -23,13 +23,12 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2
USE_ICONV= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
MAN1= wprint.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
.for file in man/wprint.1.pod src/wprint.c
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index b9fdb3248133..de5a4514ec0e 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ARGS= --with-system-t1lib \
--disable-multiplatform
CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+CFLAGS+= -I${LOCALBASE}/include
INSTALL_WRKSRC= ${WRKSRC}/texk/xdvik
PLIST_SUB= TEXMFDIR=${TEXMFDIR} TEXMFCONFIGDIR=${TEXMFDIR}-config
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 21c6ea163d2f..4bd9e85e858b 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -167,8 +167,7 @@ OPTIM+= -DBUFFERED_LOGS
CFLAGS+= -O6 -fomit-frame-pointer
.endif
-CONFIGURE_ENV= CFLAGS='${CFLAGS}' \
- OPTIM='${OPTIM}' \
+CONFIGURE_ENV= OPTIM='${OPTIM}' \
SSL_BASE='SYSTEM' \
EAPI_MM='SYSTEM' \
PATH="${PREFIX}/bin:${PATH}"
diff --git a/russian/ksocrat/Makefile b/russian/ksocrat/Makefile
index eb2543c7c077..5d490e314029 100644
--- a/russian/ksocrat/Makefile
+++ b/russian/ksocrat/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
RESTRICTED= Redistribution not allowed
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
${INSTALL_DATA} ${WRKDIR}/usr/share/apps/ksocrat/* \
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index f5d9ff592817..ef9db455e825 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -23,7 +23,6 @@ OPTIONS= HDF5 "HDF5 support" on \
CFLAGS+= ${PTHREAD_CFLAGS}
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --enable-cdi-lib --program-transform-name="" --with-zlib=/usr
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_GNOME= gnomehack
diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile
index 72845a8a2e62..e17ba9fe9538 100644
--- a/science/chemical-mime-data/Makefile
+++ b/science/chemical-mime-data/Makefile
@@ -22,7 +22,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomemimedata intltool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
INSTALLS_ICONS= yes
post-patch:
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index ae12f37b5fae..958fac5f9962 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -19,7 +19,7 @@ USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CFLAGS+="${CFLAGS}" CPPFLAGS+="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-emf=yes --with-localedir=${PREFIX}
.include <bsd.port.pre.mk>
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 9405c0280dbd..6b71f83ef247 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \
USE_GL= glut
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++
USE_GMAKE= yes
.if !defined(WITHOUT_PLOT)
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 6a5eac85761f..238a35e78310 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -30,7 +30,8 @@ USE_GNOME= gnomehack intlhack gnomedocutils gtk20 libgsf
USE_GMAKE= yes
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= --with-omf-dir=${PREFIX}/share/omf
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 056da207b21b..4f59ae42eb46 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -30,9 +30,9 @@ USE_GMAKE= yes
USE_GNOME= glib20 gtk20 libglade2 pkgconfig
USE_GL= glut
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-gamess --enable-mpqc --enable-openbabel --enable-gtk --enable-threads --enable-mopac7
-PLIST_SUB= GHEMICAL_VERSION="${PORTVERSION}"
+CONFIGURE_ARGS= --enable-gamess --enable-mpqc --enable-openbabel --enable-gtk --enable-threads --enable-mopac7
+PLIST_SUB= GHEMICAL_VERSION="${PORTVERSION}"
-MAKE_ENV= PKG_CONFIG=${LOCALBASE}/pkg-config
+MAKE_ENV= PKG_CONFIG=${LOCALBASE}/pkg-config
.include <bsd.port.mk>
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 9d7f2551d298..e51c33db5a3d 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -39,9 +39,9 @@ USE_WX= 2.8
GNU_CONFIGURE= yes
# Disable ncurses and readline from ports
CONFIGURE_FLAGS=--with_ncursesdir=/usr --with_readlinedir=/usr
-CPPFLAGS= ${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
- wxConfig=${WX_CONFIG}
+CONFIGURE_ENV= wxConfig=${WX_CONFIG}
+CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
SLAVEDIRS= science/py-gnudatalanguage
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 44cff1ea3f7d..082a3db57a72 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -17,7 +17,8 @@ USE_GNOME= libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --exec-prefix=${PREFIX} --program-suffix="" --enable-shared
PLIST_SUB= BUILD=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index d757a150edf0..b8060480c8db 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -16,8 +16,8 @@ COMMENT= Smith chart program for impedance matching
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal automake autoconf
AUTOMAKE_ARGS= -i --add-missing --foreign --copy
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 4d739fddfcce..1e06debdb169 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
fftw3.5:${PORTSDIR}/math/fftw3
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
--disable-pascal --disable-pygwy --without-kde4-thumbnailer
diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index 5fcea58ac61f..433048bfdf1e 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -21,7 +21,7 @@ USE_GCC= 4.4+
CPPFLAGS+= -I${LOCALBASE}/include
LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/usr/lib
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
USE_LDCONFIG= yes
MAN1= harminv.1
diff --git a/science/libkml/Makefile b/science/libkml/Makefile
index 53ff694f0192..565841212fcd 100644
--- a/science/libkml/Makefile
+++ b/science/libkml/Makefile
@@ -22,6 +22,5 @@ USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/science/liboglappth/Makefile b/science/liboglappth/Makefile
index ed508ab5f213..70c86f10250f 100644
--- a/science/liboglappth/Makefile
+++ b/science/liboglappth/Makefile
@@ -19,9 +19,9 @@ GNU_CONFIGURE= yes
USE_GL= glut
USE_GNOME= gnomehack
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- CXXFLAGS="-I${LOCALBASE}/include" \
- CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
+CXXFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index fb3cbbe91336..b2d9b0f7200e 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -21,11 +21,10 @@ USE_GNOME= libgnomeui libxml2
USE_ICONV= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${CP} ${FILESDIR}/carg.c ${WRKSRC}/src
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index 712926e50cd5..d0105fd3a3df 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -24,7 +24,6 @@ USE_FORTRAN= yes
MAN1= mbdyn.1
CPPFLAGS+= -fpermissive -I${LOCALBASE}/include/suitesparse
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --program-prefix=''
OPTIONS= MPI "Enable mpich-support" off \
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 4826e9952a2b..643a6e895b37 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -33,7 +33,7 @@ USE_AUTOTOOLS+= libltdl
CPPFLAGS+= -I${LOCALBASE}/include
LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/usr/lib
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
OPTIONS= OPENMPI "Enable MPI support using openmpi" On
diff --git a/science/minc/Makefile b/science/minc/Makefile
index 8175f2ffc5e3..1878fa00e0bf 100644
--- a/science/minc/Makefile
+++ b/science/minc/Makefile
@@ -30,8 +30,8 @@ LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-static=yes --enable-shared=yes
CONFLICTS= minc-2*
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index db51d2925283..f71cf2f28839 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -30,8 +30,8 @@ LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf \
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --enable-shared=yes --enable-static=yes
CONFLICTS= minc-1*
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 09c8b32b4db9..adb91517ccba 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -25,8 +25,8 @@ USE_FORTRAN= yes
.include <bsd.port.pre.mk>
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
WITH_ATLAS= yes
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index c9bdb6de3521..b5a0057781c8 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -26,7 +26,6 @@ OPTIONS= DAP "Build DAP client and remote testing" off \
CONFIGURE_ARGS= --enable-cxx --enable-cxx-4 --enable-netcdf-4 --enable-shared \
--with-hdf5=${LOCALBASE} --with-zlib=/usr
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/science/peekabot/Makefile b/science/peekabot/Makefile
index 0ed11dd14257..ddcbe967b6e5 100644
--- a/science/peekabot/Makefile
+++ b/science/peekabot/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \
gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="`fltk-config --ldflags`" \
- CPPFLAGS="`fltk-config --cflags`"
+CPPFLAGS+= `fltk-config --cflags`
+LDFLAGS+= `fltk-config --ldflags`
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/science/py-mlpy/Makefile b/science/py-mlpy/Makefile
index dfed3c900c48..deba8de87166 100644
--- a/science/py-mlpy/Makefile
+++ b/science/py-mlpy/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl
CFLAGS+= -I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= MLPY
diff --git a/science/pycdf/Makefile b/science/pycdf/Makefile
index 97e84ec6f373..4efde108b1d0 100644
--- a/science/pycdf/Makefile
+++ b/science/pycdf/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
${LOCALBASE}/lib/libnetcdf.so:${PORTSDIR}/science/netcdf
RUN_DEPENDS= ${BUILD_DEPENDS}
-LDFLAGS= "-L${LOCALBASE}/lib"
+LDFLAGS+= "-L${LOCALBASE}/lib"
USE_PYTHON= 2.5+
USE_PYDISTUTILS= yes
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 41ced0c4e0f6..7b8a4ad2041a 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
NO_LATEST_LINK= yes
USE_GMAKE= yes
diff --git a/science/udunits/Makefile b/science/udunits/Makefile
index 4dd226f8f2c3..b847c96b80a1 100644
--- a/science/udunits/Makefile
+++ b/science/udunits/Makefile
@@ -16,8 +16,8 @@ COMMENT= A library for manipulating units of physical quantities
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- ac_cv_header_CUnit_CUnit_h=no
+CONFIGURE_ENV= ac_cv_header_CUnit_CUnit_h=no
+LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index fba99db6f22a..9834a6cbce85 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -21,8 +21,8 @@ USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
.if !defined(NOPORTDOCS)
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index c1ddc800d34a..25ce8373f168 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -35,13 +35,13 @@ USE_GNOME= gtk12
USE_ICONV= yes
GNU_CONFIGURE= yes
FFLAGS+= -fno-range-check
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="-lgfx"
+CONFIGURE_ENV+= LIBS="-lgfx"
CONFIGURE_ARGS= --enable-gtk --enable-threads --with-netcdf \
--with-mixkit=${LOCALBASE}/lib/libmix.a --with-x
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= -DMIX_ANSI_IOSTREAMS -fPIC -fpermissive
diff --git a/security/aide/Makefile b/security/aide/Makefile
index fac93811e3fc..dc8247451965 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -29,8 +29,8 @@ CONFIGURE_ARGS+=--with-mhash \
--mandir=${MANPREFIX}/man \
--with-config_file=${PREFIX}/etc/aide.conf
-CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+= -I${LOCALBASE}/include
MAN1= aide.1
MAN5= aide.conf.5
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 04fb3057f307..fe894a1c5ffd 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -15,7 +15,8 @@ COMMENT= HTTP authentication brute forcer
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl"
+CONFIGURE_ENV= LIBS="-lintl"
+LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
USE_BZIP2= yes
diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
index 52c01ab75f82..9cc620adeed5 100644
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -24,7 +24,6 @@ OPTIONS+= TCL "Enable TCL support" off
USE_RC_SUBR= barnyard2.sh
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
SUB_FILES= pkg-message
PORTDOCS1= README
diff --git a/security/bcrypt/Makefile b/security/bcrypt/Makefile
index 5f3ef738c74b..0fcf40168189 100644
--- a/security/bcrypt/Makefile
+++ b/security/bcrypt/Makefile
@@ -19,7 +19,6 @@ MAKE_JOBS_SAFE= yes
ALL_TARGET= ${PORTNAME}
LDFLAGS+= -lz
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
PORTDOCS= README
MAN1= bcrypt.1
diff --git a/security/bioapi/Makefile b/security/bioapi/Makefile
index 182f01ca5a17..3a24ea7aa39c 100644
--- a/security/bioapi/Makefile
+++ b/security/bioapi/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
# Problems reported with higher optimization levels
-CONFIGURE_ENV=CFLAGS="${CFLAGS} -O"
+CFLAGS+= -O
CONFIGURE_ARGS= --localstatedir=/var/db/ --with-Qt-dir=no
USE_LDCONFIG= yes
diff --git a/security/bro/Makefile b/security/bro/Makefile
index ad4ecb4292bd..e601208bd9c1 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-perftools \
--disable-broccoli \
--disable-broctl
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index fcdb2d50b333..e08c9e210704 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -47,8 +47,6 @@ PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads
USE_AUTOTOOLS= libltdl
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --libdir=${PREFIX}/lib \
--with-dbdir=${DBDIR} \
--with-zlib=/usr \
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 243fce35ca33..cc1e373ff0e4 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -44,8 +44,6 @@ PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads
USE_AUTOTOOLS= libltdl
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --libdir=${PREFIX}/lib \
--with-dbdir=${DBDIR} \
--with-zlib=/usr \
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 6de8aacbfd7c..0937e8d52f68 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -57,8 +57,6 @@ USERDB?= ${PREFIX}/etc/userdb
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \
- LDFLAGS='${LDFLAGS}'
MAKE_ENV:= ${CONFIGURE_ENV}
CONFIGURE_ARGS= --enable-unicode \
diff --git a/security/courierpassd/Makefile b/security/courierpassd/Makefile
index 1825242499fe..2388bed64d38 100644
--- a/security/courierpassd/Makefile
+++ b/security/courierpassd/Makefile
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
MINUID?= 100
DELAY?= 3
diff --git a/security/courierpasswd/Makefile b/security/courierpasswd/Makefile
index a116d623e4d6..5edca04e66a7 100644
--- a/security/courierpasswd/Makefile
+++ b/security/courierpasswd/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
MINUID?= 100
diff --git a/security/courieruserinfo/Makefile b/security/courieruserinfo/Makefile
index 44d0b5744b6c..1a4216259efa 100644
--- a/security/courieruserinfo/Makefile
+++ b/security/courieruserinfo/Makefile
@@ -19,7 +19,6 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
MAN8= courieruserinfo.8
diff --git a/security/crank/Makefile b/security/crank/Makefile
index da656f488911..d205db4e12da 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= guile:${PORTSDIR}/lang/guile
USE_GNOME= gtk12
GNU_CONFIGURE= yes
GUILE_CONFIG= ${LOCALBASE}/bin/guile-config
-CONFIGURE_ENV= CFLAGS="${CFLAGS} `${GUILE_CONFIG} compile`" \
- LDFLAGS="`${GUILE_CONFIG} link`"
+LDFLAGS+= `${GUILE_CONFIG} link`
+CFLAGS+= `${GUILE_CONFIG} compile`
USE_GMAKE= yes
INFO= crank
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 81881d010ace..de20d55df18e 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -165,7 +165,6 @@ CONFIGURE_ARGS+=--enable-ntlm
.if ${ARCH} == "amd64"
CPPFLAGS+= -fPIC
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
.endif
.if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 060f72fbb565..9ad031047eb0 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -32,7 +32,7 @@ INFO= dirmngr
MAN1= dirmngr-client.1 dirmngr.1
CONFIGURE_ARGS+= --docdir=${DOCSDIR}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= NLS "National Language Support" off
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 5d515e038b73..2254a16066ef 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -24,7 +24,7 @@ USE_RC_SUBR= ${PORTNAME}
.include <bsd.port.pre.mk>
.if defined(WITH_STATIC)
-CONFIGURE_ENV= LDFLAGS=-static
+LDFLAGS+= -static
.endif
post-patch:
diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile
index b94440e40952..e02d4b6cc485 100644
--- a/security/firewalk/Makefile
+++ b/security/firewalk/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/Firewalk
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib
MAN8= firewalk.8
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index 5f659b30b9d3..922adc525fe8 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -17,8 +17,8 @@ COMMENT= Figaro's Password Manager, an app to securely store your passwords
USE_GNOME= gnomeprefix gnomehack gnomelibs
GNU_CONFIGURE= yes
#CONFIGURE_ARGS+= --without-included-gettext
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
MAN1= fpm.1
PORTDOCS= AUTHORS ChangeLog README TODO
diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index 59b18fe4d6fe..9920877f75b8 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -25,8 +25,8 @@ PLIST_FILES+= bin/fprint_demo
.include <bsd.port.pre.mk>
CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \
- CRYPTO_LIBS=-lcrypto \
- CFLAGS="${CFLAGS} -DHAVE_MEMMEM"
+ CRYPTO_LIBS=-lcrypto
+CFLAGS+= -DHAVE_MEMMEM
post-install:
@${ECHO}
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 115f059a8166..377bfc04928f 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -50,9 +50,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
MAKE_ARGS+= QTDIR="${QTDIR}" \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index ba7584911f10..b5d041bca5fd 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -54,9 +54,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= autoconf aclocal libtool
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
MAKE_ARGS+= QTDIR="${QTDIR}" \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 4428530905df..789888cb4fc7 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \
--with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml \
org.gnome.crypto.pgp.gschema.xml
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index bf533c3ab6be..f9593943a0b9 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -fPIC
CONFIGURE_ARGS+= --disable-guile --disable-silent-rules \
--disable-hardware-acceleration
MANCOMPRESSED= no
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 1b08c7d1d890..69d1dd70d5cf 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -30,7 +30,7 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -fPIC
CONFIGURE_ARGS+= --disable-guile
MANCOMPRESSED= no
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 7e52ef96149e..30715dc415fe 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -23,8 +23,9 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
GPGKEYS_LDAP="${LOCALBASE}/libexec/gpg2keys_ldap"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_SAFE= yes
LICENSE= GPLv3
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 2fb665e215c9..df2924990da4 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \
mhash:${PORTSDIR}/security/mhash
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
+LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic
USE_GMAKE= yes
MAN1= gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index f6c3f59c411c..33cc581d9e60 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index c8eef7cb239c..826243ed1659 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn \
USE_GNOME= gnomehack pkgconfig
USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
INFO= gsasl
@@ -37,8 +36,8 @@ USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif
-CPPFLAGS= -I/usr/include -I${LOCALBASE}/include
-LDFLAGS= -L/usr/lib -L${LOCALBASE}/lib
+CPPFLAGS+= -I/usr/include -I${LOCALBASE}/include
+LDFLAGS+= -L/usr/lib -L${LOCALBASE}/lib
post-patch:
.for file in \
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 348b3f709d3a..ced24169bdcd 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -22,15 +22,14 @@ CONFLICTS= heimdal-[0-9]*
USE_PERL5_BUILD= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-kerberos5
USE_LDCONFIG= yes
INFO= gss
PORTDOCS= gss.html gss.ps gss.pdf
-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/security/klamav/Makefile b/security/klamav/Makefile
index ab1ba6e42667..28bec1f9cfdc 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -29,7 +29,7 @@ INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool aclocal
LIBTOOLFILES= acinclude.m4 configure
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
+LDFLAGS+= ${PTHREAD_LIBS} -lintl -L${PREFIX}/lib
CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
--without-included-sqlite
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 025f1b97ddab..eb938f79263b 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -33,8 +33,7 @@ USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool autoheader autoconf
CONFIGURE_ARGS?= --enable-shared --with-krb5=${PREFIX}/bin/krb5-config
-CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
- CFLAGS="${CFLAGS}"
+CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc
MAKE_ARGS= INSTALL="${INSTALL}"
PATCH_DIST_STRIP= -p1
diff --git a/security/libecc/Makefile b/security/libecc/Makefile
index b8f3633a2bcb..4509349e58f3 100644
--- a/security/libecc/Makefile
+++ b/security/libecc/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
- CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include"
+CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
+LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} 's@endian\.h@sys/&@' ${WRKSRC}/include/libecc/bitset.h
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index 97c736d3a2ba..f446efb1a056 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -23,8 +23,8 @@ USE_OPENSSL= yes
USE_GNOME= glib20 pkgconfig
CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \
- CRYPTO_LIBS=-lcrypto \
- CFLAGS="${CFLAGS} -DHAVE_MEMMEM"
+ CRYPTO_LIBS=-lcrypto
+CFLAGS+= -DHAVE_MEMMEM
.include <bsd.port.pre.mk>
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index fdcf55faca68..848ae949c725 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -53,9 +53,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-docdir=${DOCSDIR}
MAKE_ARGS+= QTDIR="${QTDIR}" \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index ccd58fa23a34..f27a9179118e 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= 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/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index 6e7a919b71ff..ab8bb0c7bd65 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -18,8 +18,8 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
CONFIGURE_ARGS+=--disable-install-pam
-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|-DGTK_DISABLE_DEPRECATED||g' \
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 87fb8e664584..71aa438ff8f4 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 400e57c6b003..f6012156ffc3 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -23,10 +23,9 @@ GNU_CONFIGURE= yes
USE_XORG= xau
USE_GMAKE= yes
INSTALL_TARGET= install
-CONFIGURE_ENV= PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
+CONFIGURE_ENV= PREFIX="${PREFIX}"
CONFIGURE_ARGS+= --with-include-path=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-lib-path=${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
PLIST_SUB+= KRB=""
.else
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 612c1fe545f1..6643fa5c318a 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -24,8 +24,8 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS= --enable-static --with-catgets
MAN1= mcrypt.1
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index f5b6978c4ad6..047cd6d2ae40 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -45,7 +45,7 @@ MAN1_EN= ncat.1 nping.1
.ifndef WITHOUT_SSL
USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${OPENSSLINC}"
+CFLAGS+= -I${OPENSSLINC}
PLIST_SUB+= WITHSSL=""
.else
PKGNAMESUFFIX= -nossl
diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index b53785735680..0ebc5f244c62 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS= --enable-swtok --enable-tpmtok \
--localstatedir=${PREFIX}/var \
--with-pkcs11user=${USERS} \
--with-pkcs11group=${GROUPS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index eca683d8c2e2..6fdeb38af5b4 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -31,12 +31,11 @@ PLIST_DIRSTRY= www/cgi-bin
.endif
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-html-install-dir="${PREFIX}/www/openscep" \
--with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \
--with-openscep-dir="${PREFIX}/etc/openscep" \
--with-pkiclientexe="${PREFIX}/www/cgi-bin/pkiclient.exe"
-MAKE_ENV= CPPFLAGS=${CPPFLAGS}
CONF_DIR= ${PREFIX}/etc/${PORTNAME}
LOCAL_CONF_FILES= openscep.cnf openscep.ldif openscep.schema slapd.conf
diff --git a/security/openssl_tpm_engine/Makefile b/security/openssl_tpm_engine/Makefile
index cc6e0ea2aa2b..943e285fa6c2 100644
--- a/security/openssl_tpm_engine/Makefile
+++ b/security/openssl_tpm_engine/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= YES
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
USE_AUTOTOOLS= autoconf libtool
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= pkg-message
diff --git a/security/openvas-libraries/Makefile.common b/security/openvas-libraries/Makefile.common
index 8741e0850c9b..a88c4b9c1c33 100644
--- a/security/openvas-libraries/Makefile.common
+++ b/security/openvas-libraries/Makefile.common
@@ -5,4 +5,3 @@ CONFIGURE_ARGS+=--includedir=${PREFIX}/include \
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${PREFIX}/include
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index a0173cb8d4e3..12c10f35c6dd 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -21,8 +21,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/b//}
USE_GMAKE= yes
USE_GNOME= gtksharp20
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/security/osslsigncode/Makefile b/security/osslsigncode/Makefile
index 124cdd51acff..c8131be88605 100644
--- a/security/osslsigncode/Makefile
+++ b/security/osslsigncode/Makefile
@@ -16,9 +16,8 @@ COMMENT= OpenSSL-based signcode utility
PLIST_FILES= bin/osslsigncode
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_OPENSSL= yes
diff --git a/security/pam_authsrv/Makefile b/security/pam_authsrv/Makefile
index ecb629aeb9be..917d9c41f115 100644
--- a/security/pam_authsrv/Makefile
+++ b/security/pam_authsrv/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/security/fwtk:build
RESTRICTED= No form of redistribution is allowed, because of linkging against fwtk
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${PORTSDIR}/security/fwtk/work/fwtk" \
- CFLAGS="${CFLAGS} -I${PORTSDIR}/security/fwtk/work/fwtk"
+LDFLAGS+= -L${PORTSDIR}/security/fwtk/work/fwtk
+CFLAGS+= -I${PORTSDIR}/security/fwtk/work/fwtk
CONFIGURE_ARGS= --disable-encap --disable-epkg-install
INSTALL_TARGET= install-real
diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index c9dbb0df143e..8081eb8f1782 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -38,7 +38,6 @@ IGNORE= You must define KRB5_IMPL to be \"mit\" or \"heimdal\"
MANDIR= ${MANPREFIX}/man
MANDIR= ${PREFIX}/share/man
KRB5_DIR?= ${LOCALBASE}
-CONFIGURE_ENV= CFLAGS="${CFLAGS}"
CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}"
post-install:
diff --git a/security/pamtester/Makefile b/security/pamtester/Makefile
index ca7dfe424cc4..f80ed2938f86 100644
--- a/security/pamtester/Makefile
+++ b/security/pamtester/Makefile
@@ -5,20 +5,20 @@
# $FreeBSD$
#
-PORTNAME= pamtester
-PORTVERSION= 0.1.2
-CATEGORIES= security
-MASTER_SITES= SF
+PORTNAME= pamtester
+PORTVERSION= 0.1.2
+CATEGORIES= security
+MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A command line pam authentication tester
+MAINTAINER= ports@FreeBSD.org
+COMMENT= A command line pam authentication tester
-MAN1= pamtester.1
+MAN1= pamtester.1
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CPPFLAGS+= ${CFLAGS}
+USE_GMAKE= yes
-PLIST_FILES= bin/pamtester
+PLIST_FILES= bin/pamtester
.include <bsd.port.mk>
diff --git a/security/parano/Makefile b/security/parano/Makefile
index 640fb540a04b..6c7daa2a5d5d 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -19,7 +19,7 @@ USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index c6f9caa95201..e69f5060a69d 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -25,7 +25,7 @@ PHP_MODNAME= gnupg
CONFIGURE_ARGS= --with-gnupg=${LOCALBASE}/include/gpgme
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e "s|\$$GNUPG_DIR/lib|${LOCALBASE}/lib|" -e "s|-ldl||g" \
diff --git a/security/pecl-ssh2/Makefile b/security/pecl-ssh2/Makefile
index b49b68270756..4f3c4b2ccdd6 100644
--- a/security/pecl-ssh2/Makefile
+++ b/security/pecl-ssh2/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= ssh2:${PORTSDIR}/security/libssh2
USE_PHP= yes
USE_PHPEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS}
CONFIGURE_ARGS= --with-ssh2
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 1a6dbd0e6bd7..b83a9b148f92 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 0eb29f5d1480..899baa3b4424 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -36,8 +36,8 @@ USE_GNOME= intltool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-libotr-prefix=${LOCALBASE}/lib \
--with-libotr-inc-prefix=${LOCALBASE}/include
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index c993a0a48d32..424e9ab519c7 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -27,7 +27,6 @@ INFO= pinentry
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.if !defined(PINENTRY_SLAVE)
OPTIONS= NCURSES "Curses frontend" on \
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 718ab25dc7c5..d5467622a91c 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -25,7 +25,8 @@ USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
--sysconfdir=${EXAMPLESDIR} \
--libdir=${LOCALBASE}/lib --with-libwrap
-MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib SUBDIRS=
+MAKE_ENV+= SUBDIRS=
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
USE_RC_SUBR= pksd.sh
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 1d9f1600bbf6..afe7a92ae040 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -22,8 +22,8 @@ USE_AUTOTOOLS= autoconf
USE_RC_SUBR= prelude-manager.sh
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--localstatedir=/var
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib"
+CFLAGS+= -I${LOCALBASE}/include
USERS?= prelude
GROUPS?= prelude
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index 03e7d76f06bd..b5e9c6a8326a 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -25,7 +25,7 @@ PYEASYINSTALL_EGG= ${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}${PYEASY
PLIST_FILES= %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
PROJECTHOST= py-bcrypt
diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile
index 17fd85ead9b9..277412ffa50c 100644
--- a/security/py-crack/Makefile
+++ b/security/py-crack/Makefile
@@ -26,13 +26,10 @@ GNU_CONFIGURE= yes
PLIST_FILES:= ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}/_crack.so \
${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}/crack.py
-CONFIGURE_ENV= "CPPFLAGS=-I${LOCALBASE}/include" \
- "LDFLAGS=-L${LOCALBASE}/lib" \
- "DEFAULT_DICTPATH=${LOCALBASE}/libdata/cracklib/pw_dict"
-
-MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib"
-
-CFLAGS+= "-I${LOCALBASE}/include"
+CONFIGURE_ENV= "DEFAULT_DICTPATH=${LOCALBASE}/libdata/cracklib/pw_dict"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
${REINPLACE_CMD} -e 's/setup(/setup(name="${PORTNAME}",version="${PORTVERSION}",/' \
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 9a291661deec..722fdb8932ea 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -24,7 +24,7 @@ USE_PYDISTUTILS=yes
PYDISTUTILS_PKGNAME= python-mhash
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
test: install
${PYTHON_CMD} ${WRKSRC}/test.py
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index b7ddaa2e0145..200d71fd71e3 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= crack:${PORTSDIR}/security/cracklib
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 6b3d5a1f59cf..e4ff75cfcacf 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -27,8 +27,8 @@ USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= NAUTILUS "Enable the Nautilus component" on \
GEDIT "Enable GEdit plug-in support" on \
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 6a9dd20e316f..9335cb9350c2 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -35,8 +35,8 @@ USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-introspection=no
GCONF_SCHEMAS= seahorse.schemas
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 1be337995527..c596a200a1a9 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -25,8 +25,7 @@ USE_PERL5_BUILD= yes
USE_GNOME= gnomehack pkgconfig
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --with-db-dir=/var/shishi
USE_LDCONFIG= yes
@@ -34,8 +33,8 @@ INFO= shishi
SUB_FILES= pkg-message
-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/security/snort/Makefile b/security/snort/Makefile
index 146bbd6a408d..79806411142a 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -46,7 +46,6 @@ OPTIONS= IPV6 "Enable IPv6 support" on \
USE_RC_SUBR= snort.sh
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_JOBS_UNSAFE= yes
CONFIG_DIR?= ${PREFIX}/etc/snort
diff --git a/security/snort_inline/Makefile b/security/snort_inline/Makefile
index c5599b88130b..efba74fdbfe6 100644
--- a/security/snort_inline/Makefile
+++ b/security/snort_inline/Makefile
@@ -16,7 +16,6 @@ COMMENT= An inline IPS system based on snort using ipfw
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --enable-inline --enable-ipfw
LIB_DEPENDS+= dnet:${PORTSDIR}/net/libdnet
diff --git a/security/spass/Makefile b/security/spass/Makefile
index ae024d767967..872f3e1bdd7b 100644
--- a/security/spass/Makefile
+++ b/security/spass/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= boost_program_options:${PORTSDIR}/devel/boost-libs
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
USE_BZIP2= yes
PLIST_FILES= bin/spass
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index f06ca59ca3d0..9981e037108a 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -20,7 +20,6 @@ OPTIONS= CLAMAV "Enable CLAMAV support" off
USE_RC_SUBR= spybye.sh
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= spybye.1
diff --git a/security/squidclamav/Makefile b/security/squidclamav/Makefile
index 72e47f59bf14..72e94e52df23 100644
--- a/security/squidclamav/Makefile
+++ b/security/squidclamav/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
NO_LATEST_LINK= yes
SUB_FILES= pkg-message
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 6122fa0a4597..14079b524b08 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -25,8 +25,8 @@ USE_GETTEXT= yes
USE_PERL5= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fpermissive" \
- LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
+CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fpermissive
MAN1= steghide.1
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index a0cbca8fa159..a798a56f826b 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -75,13 +75,13 @@ BROKEN= 'The WITH_UCONTEXT, WITH_FORK and WITH_PTHREAD options are mutually excl
.if defined(WITH_UCONTEXT)
CONFIGURE_ARGS+=--with-threads=ucontext
CPPFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.elif defined(WITH_FORK)
CONFIGURE_ARGS+=--with-threads=fork
.else
CONFIGURE_ARGS+=--with-threads=pthread
CPPFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.endif
post-patch:
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index b831a273d0ac..7cb03a5a57ad 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -65,8 +65,8 @@ CONFIGURE_ARGS+= --with-logfac=${LOGFAC}
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
+CFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/security/sudosh/Makefile b/security/sudosh/Makefile
index ee89ef3210c6..5a383520fb9e 100644
--- a/security/sudosh/Makefile
+++ b/security/sudosh/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}"
.else
CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh
.endif
-CONFIGURE_ENV= LDFLAGS="-lutil"
+LDFLAGS+= -lutil
MAN1= sudosh.1
MAN5= sudosh.conf.5
diff --git a/security/sudosh2/Makefile b/security/sudosh2/Makefile
index 08c39833ef27..0aa7d9b4a689 100644
--- a/security/sudosh2/Makefile
+++ b/security/sudosh2/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}"
.else
CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh
.endif
-CONFIGURE_ENV= LDFLAGS="-lutil"
+LDFLAGS+= -lutil
MAN1= sudosh.1
MAN5= sudosh.conf.5
diff --git a/security/sudosh3/Makefile b/security/sudosh3/Makefile
index 68015dbc371e..91ef38f26fc8 100644
--- a/security/sudosh3/Makefile
+++ b/security/sudosh3/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}"
.else
CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh
.endif
-CONFIGURE_ENV= LDFLAGS="-lutil"
+LDFLAGS+= -lutil
MAN1= sudosh.1
MAN5= sudosh.conf.5
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 62942263a3a5..59ceaa72345b 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -25,7 +25,6 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
USE_RC_SUBR= tincd.sh
PLIST_FILES= sbin/tincd
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index 623b05bd6698..d5fa76959845 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -47,8 +47,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
+CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 0de7cd1aaa78..a3f8170817a5 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -49,8 +49,7 @@ LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc \
--enable-linker-hardening
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
+CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
TOR_LIBEVENT_LIBS="-levent-2.0"
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index 3c107d997b4a..0bdd3fb75d1b 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT= YES
USE_LDCONFIG= YES
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl -liconv
MAKE_JOBS_SAFE= YES
LICENSE= CPL
diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile
index 4adc200146f6..ba6509511c91 100644
--- a/security/tuntun/Makefile
+++ b/security/tuntun/Makefile
@@ -17,8 +17,8 @@ COMMENT= A Gnome applet gui for OpenVPN
LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= `pkg-config --cflags libgnomeui-2.0`
CONFIGURE_ARGS= --libdir=${PREFIX}/libdata/servers
USE_GMAKE= yes
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 0a430dec5624..34e2f413ee9b 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -31,7 +31,7 @@ OPTIONS+= DECRYPT "cisco-decypt password decrypt utility" on
OPTIONS+= SSL "OpenSSL certificate support (hybrid only)" off
OPTIONS+= CISCOVERSION "Mask linux presentation string" off
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" BINS="${EXTRABUILDS}"
+MAKE_ENV+= BINS="${EXTRABUILDS}"
.include <bsd.port.pre.mk>
diff --git a/security/yafic/Makefile b/security/yafic/Makefile
index f6b9e3ed58ff..d9e26a174500 100644
--- a/security/yafic/Makefile
+++ b/security/yafic/Makefile
@@ -15,7 +15,7 @@ COMMENT= Yet Another File Integrity Checker, similar to Tripwire
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= LDFLAGS="-static"
+LDFLAGS+= -static
.if defined(WITHOUT_OPENSSL)
CONFIGURE_ARGS= --disable-crypto
diff --git a/security/yapet/Makefile b/security/yapet/Makefile
index d10f43a1881c..b1e676eab7cd 100644
--- a/security/yapet/Makefile
+++ b/security/yapet/Makefile
@@ -56,8 +56,6 @@ CONFIGURE_ARGS+= --enable-nls
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/security/yara/Makefile b/security/yara/Makefile
index 92b3b0397c20..1b5c3246e587 100644
--- a/security/yara/Makefile
+++ b/security/yara/Makefile
@@ -20,7 +20,6 @@ MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= "--with-re2"
USE_LDCONFIG= yes
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 2c27edd1a3ba..f0e45fdc0196 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -17,7 +17,7 @@ USE_OPENSSL= YES
USE_PERL5_BUILD=YES
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS=${PTHREAD_LIBS} \
+ PTHREAD_LIBS=${PTHREAD_LIBS}
MAN1= zebedee.1 ftpgw.tcl.1
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index ba337aa0e0ae..fe4f3f97b527 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -98,9 +98,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \
-I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- YACC="bison -y"
+CONFIGURE_ENV= YACC="bison -y"
post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index b1b1d2284dc7..f6e501e0817c 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -22,8 +22,7 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= LIBS="${LDFLAGS}"
CONFIGURE_ARGS= --docdir=${DOCSDIR}
OPTIONS= XSEL "Build with xsel" on \
diff --git a/shells/flash/Makefile b/shells/flash/Makefile
index eb9b876a9443..87333e8e4abe 100644
--- a/shells/flash/Makefile
+++ b/shells/flash/Makefile
@@ -15,8 +15,8 @@ COMMENT= A ncurses-based restriction shell
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -rdynamic" \
- LDFLAGS="${LDFLAGS} -rdynamic"
+LDFLAGS+= -rdynamic
+CFLAGS+= -rdynamic
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index f5ec69dfa1ad..c7927961e8ec 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -31,7 +31,7 @@ USE_NCURSES= yes
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
.endif
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
--enable-function-subdirs
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+= --enable-maildir-support
.endif
.if defined(WITH_ZSH_STATIC)
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static"
+LDFLAGS+= -static
CONFIGURE_ARGS+= --disable-dynamic
PLIST_SUB+= SHARED="@comment "
.else
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 73c29debe318..f1cc3a1383e7 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -34,8 +34,8 @@ SUB_LIST= SYSCONFDIR="${SYSCONFDIR}"
PKGDEINSTALL= ${PKGINSTALL}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= \
--with-sbindir=${PREFIX}/sbin \
--with-filterdir=${PREFIX}/libexec/filters \
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index acafcff2e1ec..4d1aa9cbad4b 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -29,8 +29,8 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS= --enable-s3=yes --libdir=${PREFIX}
-CONFIGURE_ENV= CPPFLAGS='-DFUSE_USE_VERSION=26' \
- LDFLAGS='${PTHREAD_LIBS}'
+CPPFLAGS+= -DFUSE_USE_VERSION=26
+LDFLAGS+= ${PTHREAD_LIBS}
CFLAGS+= ${PTHREAD_LIBS}
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 4729e751111c..fd1a58fa5dd2 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -33,9 +33,9 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \
--sysconfdir=${ETCDIR} \
--with-serial-dev=/dev/usv
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
- CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
MAN5= apcupsd.conf.5
MAN8= apcaccess.8 apccontrol.8 apctest.8 apcupsd.8
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index 02c29d792160..0beec8744860 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -30,7 +30,6 @@ USE_LDCONFIG= yes
NO_FILTER_SHLIBS= yes
CPPFLAGS+= -I${LOCALBASE}/include/db${BDB_VER} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib/db${BDB_VER} -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
WRKSRC= ${WRKDIR}/apt-${PORTVERSION}
MAN1= apt-extracttemplates.1 apt-ftparchive.1 apt-sortpkgs.1
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index be6da4832c99..5a1649aa8351 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
MAN1= ascpu.1
diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index 11b9c14e6c3b..f1aabb521703 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
NO_INSTALL_MANPAGES= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index a54fbb12e4ef..80618e07badc 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -22,9 +22,9 @@ PLIST_SUB+= MAJOR=${PORTVERSION:R:R}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
.if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY) #Till end of the file
PKGNAMESUFFIX?= -server
diff --git a/sysutils/bacula2-server/Makefile b/sysutils/bacula2-server/Makefile
index 9c59918cf616..db52dabf1066 100644
--- a/sysutils/bacula2-server/Makefile
+++ b/sysutils/bacula2-server/Makefile
@@ -63,10 +63,10 @@ CONFIGURE_ARGS+=--with-dir-user=bacula \
--with-sd-group=operator
.endif
-CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index 870d5e58f07b..b78b4950a7be 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= battfink.schemas
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 53bf64e1bc36..ff2c54293e9c 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -35,8 +35,8 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc \
--enable-gtk3=no --enable-introspection=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= brasero.1
GLIB_SCHEMAS= org.gnome.brasero.gschema.xml
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index 77810f168668..93e993115dce 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
MAN1= bubblemon-gnome2.1
MANLANG= "" hu sv
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index ab3034861434..94b79122d522 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -17,8 +17,6 @@ COMMENT= Command-line CD/DVD writing suite
USE_CMAKE= yes
USE_ICONV= yes
-CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
MAN1= cdda2ogg.1 devdump.1 dirsplit.1 genisoimage.1 icedax.1 \
isodebug.1 isodump.1 isoinfo.1 isovfy.1 list_audio_tracks.1 \
diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile
index 765a5c64a455..bf9878a486fb 100644
--- a/sysutils/cog/Makefile
+++ b/sysutils/cog/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index fbb7495a2163..e1bcec05be55 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -28,8 +28,8 @@ CONFIGURE_ARGS+= --disable-portmon \
--disable-hddtemp \
--disable-alsa \
--disable-bmpx
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= conky.1
PLIST_FILES= bin/conky
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 61d2e9e03c61..ccb0bbfb4f0c 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -25,8 +25,8 @@ USE_GNOME= gnomehack
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
CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid \
--localstatedir=/var
diff --git a/sysutils/cpu/Makefile b/sysutils/cpu/Makefile
index 0b83aa3d29a6..77bec776684e 100644
--- a/sysutils/cpu/Makefile
+++ b/sysutils/cpu/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_OPENLDAP= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/cpu --with-ldap=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-DLDAP_DEPRECATED"
+CPPFLAGS+= -DLDAP_DEPRECATED
MAN5= cpu.conf.5
MAN8= cpu.8 cpu-ldap.8
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 218559f3069f..2f072152167f 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -19,7 +19,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-html --datadir=${DATADIR} --disable-upx
-CPPFLAGS= -DHAVE_DECL_GETOPT=0
+CPPFLAGS+= -DHAVE_DECL_GETOPT=0
MAN1= dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
@@ -29,7 +29,6 @@ PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-libintl-prefix=${PREFIX}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/sysutils/dc3dd/Makefile b/sysutils/dc3dd/Makefile
index 1c26cb6fb9ab..c581028d6aa8 100644
--- a/sysutils/dc3dd/Makefile
+++ b/sysutils/dc3dd/Makefile
@@ -18,8 +18,8 @@ USE_GETTEXT= yes
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index 5d46ed36a3ea..17a6611db56d 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -24,7 +24,7 @@ PLIST_SUB= NLS="@comment "
MAKE_ENV+= DI_NO_NLS=T
.endif
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" prefix="${PREFIX}"
+MAKE_ENV+= prefix="${PREFIX}"
.include <bsd.port.pre.mk>
diff --git a/sysutils/dircomp/Makefile b/sysutils/dircomp/Makefile
index 4e2c480b909f..ac777f723ded 100644
--- a/sysutils/dircomp/Makefile
+++ b/sysutils/dircomp/Makefile
@@ -23,7 +23,8 @@ LIB_DEPENDS+= YGP.0:${PORTSDIR}/devel/libYGP
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath
PLIST_FILES+= bin/DirComp \
share/locale/de/LC_MESSAGES/DirComp.mo \
diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile
index 8e531ec9a3c4..d150caf8c18b 100644
--- a/sysutils/dmidecode/Makefile
+++ b/sysutils/dmidecode/Makefile
@@ -18,7 +18,7 @@ COMMENT= A tool for dumping DMI (SMBIOS) contents in human-readable format
ONLY_FOR_ARCHS= i386 amd64 ia64
USE_BZIP2= yes
-MAKE_ENV+= DOCSDIR="${DOCSDIR}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= DOCSDIR="${DOCSDIR}"
LICENSE= GPLv2
.if defined(NOPORTDOCS)
diff --git a/sysutils/duff/Makefile b/sysutils/duff/Makefile
index f315b670b272..34d74370bfc5 100644
--- a/sysutils/duff/Makefile
+++ b/sysutils/duff/Makefile
@@ -19,7 +19,6 @@ MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
MAN1= duff.1
diff --git a/sysutils/dupmerge/Makefile b/sysutils/dupmerge/Makefile
index db86565159e9..fc04d02af21b 100644
--- a/sysutils/dupmerge/Makefile
+++ b/sysutils/dupmerge/Makefile
@@ -18,7 +18,6 @@ USE_ZIP= yes
MAKE_FLAGS=
MAKEFILE=
LDFLAGS+= -lroken -lcrypt
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
ALL_TARGET= dupmerge
PLIST_FILES= bin/dupmerge
PORTDOCS= readme.txt
diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index b90c6ff81809..7d1d3807da3a 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
LICENSE= GPLv3
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index 05e857bcd529..4c2c839e7ef9 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 libgnomeui
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/fileschanged/Makefile b/sysutils/fileschanged/Makefile
index a1656a7d1b3b..10997de90aa6 100644
--- a/sysutils/fileschanged/Makefile
+++ b/sysutils/fileschanged/Makefile
@@ -20,8 +20,9 @@ BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_FAM= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-largp"
+CONFIGURE_ENV+= LIBS="-largp"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --datadir=${PREFIX}/share/doc --disable-nls
INFO= fileschanged
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 50745ddb5e4f..7df2193a2c9f 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --disable-init-scripts \
--sysconfdir=${CONF_DIR} \
--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index 7027ab674f10..e81a51ccae0b 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/chironfs bin/chirctl
PORTDOCS= *
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 8264980112bb..0cd0c947397f 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -27,7 +27,8 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost-serialization=boost_serialization \
--with-boost-filesystem=boost_filesystem
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/fusefs-funionfs/Makefile b/sysutils/fusefs-funionfs/Makefile
index a8730094d5f9..66bfe2d15719 100644
--- a/sysutils/fusefs-funionfs/Makefile
+++ b/sysutils/fusefs-funionfs/Makefile
@@ -17,8 +17,8 @@ COMMENT= Union filesystem for the FUSE driver
BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
GNU_CONFIGURE= yes
MAN1= funionfs.1
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index 65a3cca61463..180fb3c8e7e7 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -29,8 +29,6 @@ USE_ICONV= yes
USE_GNOME= pkgconfig
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DFUSE_USE_VERSION=26
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/${PORTNAME}
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 290beeeb60a4..a6a40c725191 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE allows filesystem implementation in userspace
GNU_CONFIGURE= yes
-CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
USE_ICONV= yes
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index d39ac669e1e7..21e2179fcd95 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool
USE_ICONV= yes
CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \
--disable-mtab --with-fuse=external
-CPPFLAGS=-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
-CONFIGURE_ENV="LDFLAGS=-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= LOCK "Lock the device when mounting (avoids access)" on \
UBLIO "Enable user space cache for improved speed" on
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index 56306f89ada8..9f2a7c6f7679 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
SUB_FILES= pkg-message
post-install:
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index cf35624be261..54711fa9f72e 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
BUILD_DEPENDS= fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_GNOME= glib20
MAN1= sshfs.1
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 6c254fef34a8..fa9a404a8e7f 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -33,7 +33,7 @@ LIBTOOLFILES= configure libmetrics/configure
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-setuid=ganglia --enable-setgid=ganglia
-CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1 LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 75fbcf574ae4..a6e8cd30505b 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gtk12 gnomehier
USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
-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 ; \
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 72a94f513e61..1e413ab9254f 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -23,8 +23,8 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gconf-editor.1
GCONF_SCHEMAS= gconf-editor.schemas
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 130f87ab6277..6b06ab84cbf5 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -22,8 +22,8 @@ USE_XORG= x11 xtst
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= libexec/gkrellm2/plugins/gkleds.so
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index ec7ca2fb9ce5..c8cc0cad914d 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= gksu2:${PORTSDIR}/sysutils/libgksu \
USE_GNOME= gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gksu.1
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 8d13d34e7144..73e45bb7c64d 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -36,8 +36,8 @@ GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= control-center.schemas fontilus.schemas \
gnome-control-center.schemas
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index b0ad52cddb3e..476c2236db26 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -24,7 +24,7 @@ USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
INSTALLS_OMF= 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/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 603aeaf248c0..203ec2c65c0a 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -25,8 +25,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nautilus-extension
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-mount.schemas
MAN1= gnome-mount.1
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index de2119600321..dcdcc6b03bf3 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui intlhack
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-pkgview.schemas
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 093254d5f728..7fab7edda9c2 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -36,8 +36,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libwnck \
CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
--disable-docbook-docs \
--enable-hal
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-power-manager.schemas
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 584c5943f178..dab58d5e9a8c 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -33,8 +33,8 @@ USE_GSTREAMER= good
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= PULSEAUDIO "Enable Pulseaudio support" On
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index db9bc9a3ecc4..344e3125fae4 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -27,8 +27,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
librsvg2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lutil"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lutil"
+CPPFLAGS+= -I${LOCALBASE}/include
GCONF_SCHEMAS= gnome-system-monitor.schemas
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index ad8b69551bf3..c23d84d8c040 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -29,8 +29,8 @@ USE_GNOME= gnomehack gnomeprefix intlhack nautilus2
USE_AUTOTOOLS= libtool
INSTALLS_OMF= yes
CONFIGURE_ARGS= --enable-services
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.system-tools.gschema.xml
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 9925f5024326..67f4350fd4b9 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -25,8 +25,8 @@ INSTALLS_OMF= yes
USE_GETTEXT= yes
USE_GSTREAMER= vorbis mp3 flac
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic
ONLY_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= Coredump on amd64, see PR: ports/130972
diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index 77678d6a7ac9..a89169c0e916 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/${PORTNAME}
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index 2fb21c665475..da5972386382 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -23,8 +23,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_CDRTOOLS= yes
USE_GNOME= libglade2 intlhack gnomehack gnomeprefix
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
MAN1= graveman.1
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index e096374518fd..014908281645 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A GTK2-based imond-client to control an on(e) disc fli4l router
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gtk20 gnomehier
post-patch:
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 104402c0e525..894b658dcf51 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -19,8 +19,8 @@ USE_GMAKE= yes
USE_GNOME= gnomelibs gnomehier
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 ; \
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index f6434c2a6534..85a3a8358823 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
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
.include <bsd.port.mk>
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index f93076836367..1ebf885644c4 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -44,9 +44,9 @@ CONFIGURE_ARGS= --disable-gtk-doc \
--with-pid-file=/var/run/hald/hald.pid \
--with-deprecated-keys \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GTKDOC="false"
+CONFIGURE_ENV= GTKDOC="false"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
#HALVERSION= 0.5.10
#SNAPVERSION= 20080218
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index a6036f925c62..c5748e06af98 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -37,8 +37,8 @@ USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet115" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet115"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet115
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet115
CONFIGURE_ARGS= --prefix=${PREFIX} \
--localstatedir=/var \
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index eeb320a1ca64..edf76ef2c72b 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -18,8 +18,6 @@ COMMENT= File splitter, GTK and CLI versions
USE_GNOME= #
USE_GMAKE= yes
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
PORTDOCS= README
OPTIONS= CLI "CLI interface" on \
diff --git a/sysutils/iextract/Makefile b/sysutils/iextract/Makefile
index 0f4727204e3a..43613528ad4d 100644
--- a/sysutils/iextract/Makefile
+++ b/sysutils/iextract/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS= YGP.0:${PORTSDIR}/devel/libYGP
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath
.include <bsd.port.mk>
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 80ee5c416c0c..fac71e7b65d3 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -21,7 +21,6 @@ USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-intf-lan --enable-intf-lanplus \
--disable-intf-imb --disable-intf-lipmi --disable-intf-bmc
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/ipmitool sbin/ipmievd share/ipmitool/oem_ibm_sel_map
PLIST_DIRS= share/ipmitool
PORTDOCS= AUTHORS COPYING ChangeLog README
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 1ffda8a7db0e..a7830bc0d76a 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -45,6 +45,4 @@ CONFIGURE_ARGS+= --with-tcltk --disable-nls \
PLIST_SUB+= NLS="@comment "
.endif
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
.include <bsd.port.post.mk>
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index 66c001350f09..76444acb6641 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -26,9 +26,6 @@ MAKEFILE= GNUmakefile
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
MAN1= ldapvi.1
PLIST_FILES= bin/ldapvi \
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index 56d0c91e5256..f7792aaa4d73 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
MAN1= less.1 lesskey.1 lessecho.1
.if defined(COLOUR_LESS) || defined(COLOR_LESS)
-MAKE_ENV= CPPFLAGS="-DCOLOR_LESS"
+CPPFLAGS+= -DCOLOR_LESS
pre-fetch:
@${ECHO_MSG} "Making a color version of less."
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 05d4f20305d8..e0b198fbb88d 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -30,7 +30,8 @@ USE_NCURSES= yes
CONFIGURE_ARGS+= --with-libpopt-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE} \
USE_PERL5_BUILD=yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
MAN1= cd-drive.1 cd-info.1 iso-read.1 iso-info.1 cd-read.1
INFO= libcdio
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index fcfee747224d..080f516b7261 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS= --enable-gtk-doc=no
GNU_CONFIGURE= yes
GCONF_SCHEMAS= gksu.schemas
USE_GMAKE= 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/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index ea45af9fd8b3..e0f93b270506 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_XORG= x11 xext xt xtst xfixes
USE_GMAKE= 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}
CONFIGURE_ARGS+= --program-prefix=''
MAN1= lineak_defaultplugin.1
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index e44d4bb934e8..2a5a67684a69 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-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}
CONFIGURE_ARGS+= --program-prefix=''
MAN1= lineak_kdeplugins.1
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index b00b47ccc36c..9e6435460286 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd \
USE_GMAKE= yes
USE_XORG= x11 xext xt
-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}
CONFIGURE_ARGS= --program-prefix=''
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 070ca8f04940..39c78b9092e6 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -18,8 +18,8 @@ COMMENT= Lineakd is a daemon which enables special keys on internet keyboards
USE_GMAKE= yes
USE_XORG= x11 xext xt
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--program-prefix=''
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index b35bb12d9655..34a27fd30684 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -16,7 +16,6 @@ COMMENT= Parse ASCII logfiles into ANSI, CSV, HTML formats
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS}"
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/${PORTNAME}
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile
index 18975bfa1dc2..df26e2202726 100644
--- a/sysutils/lxinput/Makefile
+++ b/sysutils/lxinput/Makefile
@@ -26,7 +26,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/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile
index 7f763d67f7a2..6298bc1d4092 100644
--- a/sysutils/lxtask/Makefile
+++ b/sysutils/lxtask/Makefile
@@ -24,7 +24,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/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile
index 406bfb80de59..8a26ab86c025 100644
--- a/sysutils/lxterminal/Makefile
+++ b/sysutils/lxterminal/Makefile
@@ -28,7 +28,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/sysutils/memfetch/Makefile b/sysutils/memfetch/Makefile
index e0517feb07fb..e572a091634f 100644
--- a/sysutils/memfetch/Makefile
+++ b/sysutils/memfetch/Makefile
@@ -19,7 +19,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_PERL5_RUN= yes
CFLAGS+= ${CPPFLAGS}
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/sysutils/metalog/Makefile b/sysutils/metalog/Makefile
index f419235d1f56..96bbbe2b55cb 100644
--- a/sysutils/metalog/Makefile
+++ b/sysutils/metalog/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
USE_RC_SUBR= ${PORTNAME}
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index c49d7ec95bc3..f089e6069d65 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -21,7 +21,7 @@ USE_BISON= build
USE_GMAKE= yes
USE_RC_SUBR= ${PORTNAME}.sh
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
+CONFIGURE_ENV= CONFIG_SHELL="${SH}" \
LOCALBASE="${LOCALBASE}"
OPTIONS= SSL "Enable SSL support" on
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index 55ec408ff873..c288627b8000 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -22,7 +22,5 @@ USE_GNOME= gtk12 glib12
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index cb7cb740ad2f..dba584de9dea 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -31,8 +31,8 @@ USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= nautilus-cd-burner.schemas
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index e304e749f121..f0369877b371 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -20,7 +20,8 @@ USE_GNOME= pkgconfig
USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= GNOMEVFS2 "Install GnomeVFS 2.0 libntfs interface" off \
LOCK "Lock the device when mounting (avoids access)" on \
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 162eaccca451..1a31edbcdf75 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -27,7 +27,6 @@ AUTOMAKE_ARGS+= --add-missing --copy --foreign
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ipmi_ui.1 openipmicmd.1 openipmigui.1 \
openipmish.1 rmcp_ping.1 solterm.1
diff --git a/sysutils/pefs-kmod/Makefile b/sysutils/pefs-kmod/Makefile
index f0afdc306d84..b9d1e877cc2b 100644
--- a/sysutils/pefs-kmod/Makefile
+++ b/sysutils/pefs-kmod/Makefile
@@ -22,7 +22,7 @@ KMODDIR?= /boot/modules
PLIST_SUB= KMODDIR=${KMODDIR}
MAKE_ENV= BINDIR="${PREFIX}/sbin" MANDIR="${MANPREFIX}/man/man" \
NO_MANCOMPRESS= \
- KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" \
+ KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys"
MAN8= pefs.8
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 329653d57ec5..2afb2c0d4b8e 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -23,8 +23,8 @@ WANT_GNOME= yes
USE_PYTHON= 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
DOCS= AUTHORS COPYING ChangeLog HACKING \
MAINTAINERS NEWS README TODO
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
index bfa72705d395..1b6c7d0ec83c 100644
--- a/sysutils/policykit-gnome/Makefile
+++ b/sysutils/policykit-gnome/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= polkit-gnome.schemas
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index cc27d1092a17..fe5ca3891d73 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -32,9 +32,9 @@ CONFIGURE_ARGS= --disable-gtk-doc \
--localstatedir=/var \
--with-polkit-user=polkit \
--with-polkit-group=polkit
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GTKDOC="false"
+CONFIGURE_ENV= GTKDOC="false"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NO_INSTALL_MANPAGES)
CONFIGURE_ARGS+=--disable-man-pages
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 1bea70b0fe70..b10e0ea57ff6 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--localstatedir=/var
-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/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index 0e316fd65165..2bce61d84e3e 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -28,7 +28,7 @@ USE_QT_VER= 4
QT_COMPONENTS= corelib dbus gui network svg xml \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index e1fcbac4cf51..3408391bfee3 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -30,9 +30,9 @@ CONFIGURE_ARGS= --disable-gtk-doc \
--with-os-type=freebsd \
--enable-introspection \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GTKDOC="false"
+CONFIGURE_ENV= GTKDOC="false"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NO_INSTALL_MANPAGES)
CONFIGURE_ARGS+=--disable-man-pages
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 9db70a3b1539..cccca9448b45 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-httppower --localstatedir=${DESTDIR}/var \
--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
@@ -32,8 +31,8 @@ MAN3= libpowerman.3
MAN5= powerman.conf.5 powerman.dev.5
MAN8= httppower.8 plmpower.8 powermand.8 vpcd.8
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 3ecfdf0b6d83..6d439ec4ef2e 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -26,7 +26,8 @@ EXTRA_PATCHES= ${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in
CONFIGURE_ARGS+=--disable-nls
.else
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
MAN8= cpfs.reiserfs.8 mkfs.reiserfs.8 reiserfs.8 \
diff --git a/sysutils/pwgen/Makefile b/sysutils/pwgen/Makefile
index e6279bbd0a62..803c5663a84a 100644
--- a/sysutils/pwgen/Makefile
+++ b/sysutils/pwgen/Makefile
@@ -16,8 +16,6 @@ MAINTAINER= oddbjorn@tricknology.org
COMMENT= A simple password generator
WRKSRC= ${WRKDIR}/${PORTNAME}-1
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
MAN1= pwgen.1
PLIST_FILES= bin/pwgen
diff --git a/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index 23eb84a2ef1d..e551edd59640 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -20,8 +20,8 @@ USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= pyrenamer.1
GCONF_SCHEMAS= pyrenamer.schemas
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index 55979963d71d..8f7ad785cd57 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -21,8 +21,8 @@ USE_ICONV= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gnomeprefix libglade2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/quicksynergy \
share/locale/pt_BR/LC_MESSAGES/quicksynergy.mo
diff --git a/sysutils/radeontool/Makefile b/sysutils/radeontool/Makefile
index 4f2d900dbdbb..6eca2750f665 100644
--- a/sysutils/radeontool/Makefile
+++ b/sysutils/radeontool/Makefile
@@ -13,6 +13,4 @@ MASTER_SITES= http://fdd.com/software/radeon/
MAINTAINER= takawata@jp.freebsd.org
COMMENT= ATI Radeon video card contoroling tool useful for laptops
-MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
.include <bsd.port.mk>
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 97e34f4c5923..b1a1f2362514 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
MAKEFILE= GNUmakefile
diff --git a/sysutils/rsyslog3/bsd.rsyslog.mk b/sysutils/rsyslog3/bsd.rsyslog.mk
index 919950a4edf5..dd7878350bd3 100644
--- a/sysutils/rsyslog3/bsd.rsyslog.mk
+++ b/sysutils/rsyslog3/bsd.rsyslog.mk
@@ -9,7 +9,6 @@ CONFLICTS= rsyslog-[!3].[0-9]*
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_GNOME+= pkgconfig
.ifdef MNAME
diff --git a/sysutils/rsyslog4-devel/Makefile b/sysutils/rsyslog4-devel/Makefile
index dc78b9e421b0..6e74ac975acc 100644
--- a/sysutils/rsyslog4-devel/Makefile
+++ b/sysutils/rsyslog4-devel/Makefile
@@ -44,7 +44,6 @@ BROKEN= does not build on 6.x
.if ${ARCH} == "i386"
CPPFLAGS+=-march=i686
.endif
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.ifndef MNAME
MAN8= rsyslogd.8
diff --git a/sysutils/rsyslog4/Makefile b/sysutils/rsyslog4/Makefile
index 4cee084efc00..6b1f04a74d57 100644
--- a/sysutils/rsyslog4/Makefile
+++ b/sysutils/rsyslog4/Makefile
@@ -44,7 +44,6 @@ BROKEN= does not build on 6.x
.if ${ARCH} == "i386"
CPPFLAGS+=-march=i686
.endif
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.ifndef MNAME
MAN8= rsyslogd.8
diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile
index 019012a2b9df..5cce2924cc3f 100644
--- a/sysutils/rsyslog5/Makefile
+++ b/sysutils/rsyslog5/Makefile
@@ -50,7 +50,6 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
.if ${ARCH} == "i386"
CPPFLAGS+=-march=i686
.endif
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.ifndef MNAME
MAN8= rsyslogd.8
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile
index 1e0af7480edc..31b1e581835e 100644
--- a/sysutils/rsyslog6-devel/Makefile
+++ b/sysutils/rsyslog6-devel/Makefile
@@ -42,7 +42,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname
CONFLICTS= rsyslog-devel-[!6].[0-9]*
CFLAGS+= -I${LOCALBASE}/include
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
@@ -56,7 +56,8 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
CPPFLAGS+=-march=i686
.endif
-CONFIGURE_ENV+= CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
+CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
+CFLAGS+= ${CPPFLAGS}
.ifndef MNAME
MAN8= rsyslogd.8
diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile
index f434522ff305..5bb62ed388f6 100644
--- a/sysutils/scanbuttond/Makefile
+++ b/sysutils/scanbuttond/Makefile
@@ -17,8 +17,8 @@ COMMENT= A daemon to monitor and configure modern scanner's buttons
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CPPFLAGS= "-I${LOCALBASE}/include"
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index 6f39f031dcd1..d96d92278639 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
DEFINES= -DMBMON_EXECUTABLE=\\\"${LOCALBASE}/bin/mbmon\\\" \
-DSMARTCTL_HELPER=\\\"${PREFIX}/libexec/smartctl-helper\\\"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${DEFINES}" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include ${DEFINES}
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${CP} -f ${FILESDIR}/mbmon-sensors-interface.* \
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 7570e5245407..0328d94b090a 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -22,13 +22,12 @@ MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= slmon.1
PLIST_FILES= bin/slmon
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lncurses -lm
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lncurses -lm
.include <bsd.port.pre.mk>
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index ae353348ea0d..18e8056b8f86 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mouse and keyboard sharing utility
USE_CMAKE= yes
USE_XORG= ice xtst x11 sm
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
CFLAGS+= -L${LOCALBASE}/lib -I${LOCALBASE}/include
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 18bab1b7d8dd..811ff211a813 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -45,8 +45,8 @@ SUB_FILES= pkg-message
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
- LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+CFLAGS+= `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+= `${LIBNET_CONFIG} --libs`
.if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
BROKEN= SYS_SSL and PORTS_SSL are mutually exclusive
diff --git a/sysutils/syslog-ng2/Makefile b/sysutils/syslog-ng2/Makefile
index bd8b786ce124..f52766d6e60c 100644
--- a/sysutils/syslog-ng2/Makefile
+++ b/sysutils/syslog-ng2/Makefile
@@ -29,8 +29,8 @@ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags`" \
- LDFLAGS="`${LIBNET_CONFIG} --libs`"
+LDFLAGS+= `${LIBNET_CONFIG} --libs`
+CFLAGS+= `${LIBNET_CONFIG} --cflags`
.include <bsd.port.pre.mk>
diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile
index 18bab1b7d8dd..811ff211a813 100644
--- a/sysutils/syslog-ng3-devel/Makefile
+++ b/sysutils/syslog-ng3-devel/Makefile
@@ -45,8 +45,8 @@ SUB_FILES= pkg-message
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
- LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+CFLAGS+= `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+= `${LIBNET_CONFIG} --libs`
.if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
BROKEN= SYS_SSL and PORTS_SSL are mutually exclusive
diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile
index 372092525898..094889c6703a 100644
--- a/sysutils/syslog-ng3/Makefile
+++ b/sysutils/syslog-ng3/Makefile
@@ -42,8 +42,8 @@ SUB_FILES= pkg-message
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
- LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+CFLAGS+= `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+= `${LIBNET_CONFIG} --libs`
.if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
BROKEN= SYS_SSL and PORTS_SSL are mutually exclusive
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index ca2ca4171894..7efa7b04d9ac 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -28,8 +28,8 @@ GNU_CONFIGURE= yes
USE_GNOME_SUBR= yes
CONFIGURE_ARGS= --with-stb-group=wheel \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-configure:
@${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index a819792d207b..385b7d649a80 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
CONFIGURE_ARGS= --without-ewf
MAN8= fidentify.8 testdisk.8 photorec.8
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index a30609f70429..869ca0dfaf61 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -46,8 +46,6 @@ LESTATIC= ${LOCALBASE}/lib/libevent.a
. endif
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-
.if defined(WITH_BACKSPACE)
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c
.endif
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 50f4d6a9ce8d..44c0dcce570e 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -16,7 +16,7 @@ COMMENT= System monitor that renders text on desktop
GNU_CONFIGURE= yes
USE_XORG= x11
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= torsmo.1
PLIST_FILES= bin/torsmo \
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 6d59314e5962..f870a1acc6e0 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -45,8 +45,8 @@ USE_LDCONFIG= yes
USE_GSTREAMER= core
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}
CONFIGURE_ARGS= --enable-video-extractor=gstreamer \
--enable-file-monitoring=fam \
--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
diff --git a/sysutils/tss/Makefile b/sysutils/tss/Makefile
index d8965dd9c256..93ba50c90321 100644
--- a/sysutils/tss/Makefile
+++ b/sysutils/tss/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES= http://www.pulia.nu/tss/src/
MAINTAINER= peter@pean.org
COMMENT= Terminal ScreenSaver that allows you to lock you terminal
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
post-patch:
@ ${REINPLACE_CMD} -e "s|/etc/tss|${PREFIX}/etc/tss|" ${WRKSRC}/src/main.c
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index f12a5be847fe..59a6d7cd0e24 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -52,7 +52,7 @@ PLIST_FILES+= bin/${UDFCLIENTFS_NAME}
.endif
.if defined(WITH_DEBUG)
-CONFIGURE_ENV+= CFLAGS="-O0 -ggdb3"
+CFLAGS+= -O0 -ggdb3
.endif
post-patch:
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 20a013e62fa0..11a79ca33ec9 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -25,9 +25,9 @@ GNU_CONFIGURE= yes
MAN1= unieject.1
MAN5= unieject.conf.5
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lcdio -lconfuse
-CONFIGURE_ENV= PKG_CONFIG="${TRUE}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lcdio -lconfuse
+CONFIGURE_ENV= PKG_CONFIG="${TRUE}"
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} \
--with-libpopt-prefix=${LOCALBASE}
diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile
index dcd8ad4c07c6..76ae94f82d0f 100644
--- a/sysutils/uniutils/Makefile
+++ b/sysutils/uniutils/Makefile
@@ -17,9 +17,9 @@ COMMENT= Unicode Description Utilities
RUN_DEPENDS= ascii2binary:${PORTSDIR}/converters/ascii2binary
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- LIBS="-lintl"
+CONFIGURE_ENV= LIBS="-lintl"
+CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GETTEXT= yes
TESTFILES= Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u \
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 123babb0cad6..df0b57a5f25c 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -31,9 +31,9 @@ USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--with-backend=freebsd \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GTKDOC="false"
+CONFIGURE_ENV= GTKDOC="false"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NO_INSTALL_MANPAGES)
CONFIGURE_ARGS+=--disable-man-pages
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile
index 11388bbd364c..b13605a54c40 100644
--- a/sysutils/usbhotkey/Makefile
+++ b/sysutils/usbhotkey/Makefile
@@ -26,13 +26,15 @@ HAS_CONFIGURE= yes
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_PTHREADS)
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/ruby-${RUBY_VER} \
+ -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
.else
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/ruby-${RUBY_VER} \
+ -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
.if !defined(WITHOUT_GUI)
diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile
index 09e3a03ecaf0..c45549998585 100644
--- a/sysutils/usbutils/Makefile
+++ b/sysutils/usbutils/Makefile
@@ -15,8 +15,8 @@ COMMENT= Utility for listing USB devices
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --datadir=${DATADIR} --enable-zlib
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/sysutils/vstrip/Makefile b/sysutils/vstrip/Makefile
index 6bc383b3ef33..45dc1881cd7c 100644
--- a/sysutils/vstrip/Makefile
+++ b/sysutils/vstrip/Makefile
@@ -21,7 +21,6 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/license.txt
USE_ZIP= yes
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index f84efc589fd3..25030710229f 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_GNOME= gtk20
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}" AUTOHEADER="${TRUE}" \
AUTOMAKE="${TRUE}"
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 53637bd1fd39..cf424f5a18da 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -22,7 +22,6 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= autoconf libtool:env
GNU_CONFIGURE= yes
CONFIGURE_ENV+= INSTALL="${INSTALL} ${_BINOWNGRP}" \
- CFLAGS="${CFLAGS}" \
LIBTOOL=${LIBTOOL}
MAKE_ENV+= INSTALL="${INSTALL} ${_BINOWNGRP}"
CONFIGURE_ARGS+= --disable-shared --enable-readline
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 22d658cbeba1..2d5333d02324 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -17,13 +17,12 @@ COMMENT= Quick & easy monitoring of logfiles and devices
USE_GNOME= gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= xlogmaster.1
INFO= xlogmaster
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/sysutils/xsu/Makefile b/sysutils/xsu/Makefile
index c80dcef2e929..1eaf67d246db 100644
--- a/sysutils/xsu/Makefile
+++ b/sysutils/xsu/Makefile
@@ -17,8 +17,8 @@ COMMENT= Xsu runs commands as root after prompting for the root password
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs
CONFIGURE_ARGS= --su-pwd-out="Password:"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN8= xsu.8
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 36d365770766..2848987abde3 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -25,9 +25,9 @@ RUN_DEPENDS= animate:${PORTSDIR}/graphics/ImageMagick
GNU_CONFIGURE= yes
# Remove MAKE="${GMAKE}" after ffmpeg-devel's upgrade
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LOCALBASE="${LOCALBASE}" \
+CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \
MAKE="${GMAKE}"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-forced-embedded-ffmpeg # To be removed after ffmpeg-devel's upgrade
USE_GMAKE= yes # To be removed after ffmpeg-devel's upgrade
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 7c88f0d58432..6e5c545b6df6 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -26,8 +26,8 @@ APREV= 0
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gnomehack pkgconfig
USE_LDCONFIG= yes
diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile
index cdd7107b8c5f..d9c9f4be3224 100644
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= gtk20 intltool pkgconfig
CONFIGURE_ARGS= --enable-static=no --x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/WordNet
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/WordNet
OPTIONS= NOTIFY "Popup word definition as notification" On
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 9155d0a09244..7aae8fd2b923 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \
--enable-static
PTHREAD_CFLAGS= # Disable threading
PTHREAD_LIBS= # libaspell may be used by unthreaded apps.
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_GMAKE= yes
USE_ICONV= yes
USE_PERL5_BUILD= yes
diff --git a/textproc/cost/Makefile b/textproc/cost/Makefile
index 2cd9e0548bc6..3bb37bb7c4e2 100644
--- a/textproc/cost/Makefile
+++ b/textproc/cost/Makefile
@@ -20,7 +20,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--with-tcl=${LOCALBASE}/lib/tcl8.4 \
--with-docdir=${PREFIX}/share/doc/cost --with-charmaps
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
+CONFIGURE_ENV+= TCL_INCLUDE_SPEC="${LOCALBASE}/include/tcl8.4"
+CFLAGS+= -fPIC
post-patch:
@${REINPLACE_CMD} -e 's|TCL_SRC_DIR%g|TCL_INCLUDE_SPEC%g|' \
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index f6c525fc6911..840675e43663 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -22,8 +22,8 @@ USE_BISON= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
ALL_TARGET= dict
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 4fde88bf91e6..e04ec5ac3ca6 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS= maa.3:${PORTSDIR}/devel/libmaa
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-cflags="${CFLAGS}"
ALL_TARGET= dictfmt
INSTALL_TARGET= install.dictfmt
diff --git a/textproc/diffmark/Makefile b/textproc/diffmark/Makefile
index 34730a64904e..df7ef0c939e3 100644
--- a/textproc/diffmark/Makefile
+++ b/textproc/diffmark/Makefile
@@ -21,6 +21,5 @@ CONFIGURE_ARGS= --with-libxml2-incldir=${LOCALBASE}/include/libxml2
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index 38fed0fcd134..76eea6e3a8e1 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -28,7 +28,7 @@ SHLIB_MAJOR= 0
USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX} LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX}
USE_LDCONFIG= yes
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index 30e4645d4bf2..f9a0cc01a283 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -24,8 +24,6 @@ HAS_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --mandir=${MANPREFIX}/man
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
MAN1= ${PORTNAME}.1 dwfilter.1
PORTDOCS= COPYING Changelog README
diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile
index e2f4106c43da..fe950441b4b4 100644
--- a/textproc/ekhtml/Makefile
+++ b/textproc/ekhtml/Makefile
@@ -16,8 +16,8 @@ COMMENT= El-Kabong is a speedy, yet forgiving, SAX-style HTML parser
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 17651fcc8d58..4f76bd1db871 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS= --disable-uspell \
--disable-voikko
MAKE_JOBS_SAFE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= enchant.1
diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile
index d9498f515701..e43d6cf3202e 100644
--- a/textproc/estraier/Makefile
+++ b/textproc/estraier/Makefile
@@ -25,8 +25,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-sysqdbm \
--enable-dlfilter \
--enable-devel
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/include ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/include ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index 784018f3d354..ce459b3806d7 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -19,9 +19,9 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_AUTOTOOLS= libtool
USE_GNOME= ltverhack gnomehack
CONFIGURE_ARGS= --enable-unittest=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-liconv"
+CONFIGURE_ENV= LIBS="-liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_ICONV= yes
USE_LDCONFIG= yes
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index de78591882e8..d06fa7ba4970 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
USE_AUTOTOOLS= libtool
USE_GNOME= glib20 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB= DOCSDIR="share/doc/${DISTNAME}"
USE_LDCONFIG= yes
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 6112e910cd8b..232e2325350a 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -21,7 +21,7 @@ PORTDOCS= README COPYRIGHT
NO_CDROM= Restrictive copyright (don not sell for profit)
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -DISO_CHAR_SET=1 -D__STRICT_ANSI__"
+CFLAGS+= -DISO_CHAR_SET=1 -D__STRICT_ANSI__
MAN1= glimpse.1 glimpseindex.1 glimpseserver.1 agrep.1
pre-configure:
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index cca48c8e35e8..4d7d34682296 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -24,8 +24,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= glib20 gnomehack libxml2
USE_GMAKE= 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
OPTIONS= OCAML "OCAML language support" off
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 4392e74db872..6c5a9fcd9505 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -31,8 +31,8 @@ USE_PYTHON= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/omf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= xml2po.1
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 7a717c2e34fb..aaa233057d32 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
post-patch:
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index 7dac4b1ecb39..9fc0a9c64161 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -23,8 +23,8 @@ GCONF_SCHEMAS= gnome-translate.schemas
USE_GNOME= gnomehack gnomeprefix eel2 intlhack libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -Wl,-export-dynamic"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -Wl,-export-dynamic
OPTIONS= LANGUAGE_DETECTION "language detection" on
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index bed7d3f87be7..8545da8e0a72 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -33,7 +33,6 @@ OPTIONS= PCRE "Compile with Perl-compatible regex support" off
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
LDFLAGS+= -lintl -L${LOCALBASE}/lib
PLIST_SUB+= NLS=
.else
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index a1e4e6e7c769..15110fa5557b 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -16,8 +16,8 @@ COMMENT= A frontend for diff(1)
USE_GNOME= gnomehack gnomeprefix gnomelibs
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gtkdiff.1 gtkdiff-rcs.1
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 3ff8760699ea..0029bbb70717 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -25,8 +25,8 @@ USE_GNOME= gnomeprefix gnomehack gtk20 intlhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index ee21a34adeda..52b67a494390 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -22,8 +22,8 @@ USE_ICONV= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-bzip2 --disable-zlib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
OPTIONS= LZO "Enable lzo support" off \
MECAB "Enable mecab support" off
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index 4309cecfddd8..d1b5b384b95c 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -27,7 +27,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 36146f83dc1c..070c35cac50b 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --disable-iso-codes-check
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.else
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 78505c3e5f82..49a7e68bf4a6 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
INFO= iksemel
diff --git a/textproc/ipdf/Makefile b/textproc/ipdf/Makefile
index a3a215dbd702..628ce5ece6cb 100644
--- a/textproc/ipdf/Makefile
+++ b/textproc/ipdf/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= pdf.8:${PORTSDIR}/print/pdflib \
tiff.4:${PORTSDIR}/graphics/tiff
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= ipdf.1
PLIST_FILES= bin/ipdf
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index 42a20128d97b..5bd4ed8184f2 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -17,7 +17,8 @@ COMMENT= An English-Bulgarian-English dictionary
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+= --with-kde
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
USE_KDELIBS_VER= 3
.include <bsd.port.mk>
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index c788e8d060ac..56b8618949ac 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -27,7 +27,6 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -liconv
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
DOCSDIR= ${PREFIX}/share/doc/kmfl/${PORTNAME}
DOCS= ${DISTDIR}/${DIST_SUBDIR}/KMFL-Compiler.sxw \
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 49884aeac5eb..68703b628b68 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/libextractor
CONFIGURE_ARGS= --disable-ltdl-install
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude libltdl
@@ -113,7 +113,7 @@ PLIST_SUB+= RPM="@comment "
# QT can be disabled
.if !defined(WITHOUT_QT)
LIB_DEPENDS+= QtGui:${PORTSDIR}/x11-toolkits/qt4-gui
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4"
+LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4
CONFIGURE_ARGS+=--with-qt=${LOCALBASE}
PLIST_SUB+= QT=""
.else
diff --git a/textproc/libkmfl/Makefile b/textproc/libkmfl/Makefile
index e19a00026ee4..eb3661d8b2e6 100644
--- a/textproc/libkmfl/Makefile
+++ b/textproc/libkmfl/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
DOCSDIR= ${PREFIX}/share/doc/kmfl/${PORTNAME}
PORTDOCS= AUTHORS COPYING ChangeLog
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 1b4557212cfd..f19d38f144e6 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS= raptor.3:${PORTSDIR}/textproc/raptor
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 1c1d36eb5e5b..18e60baab767 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -23,7 +23,6 @@ OPTIONS= PHPMRSS "support to PHP" on
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
WANT_GNOME= yes
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index a8b270e20186..61a963f0e5e2 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -18,7 +18,8 @@ COMMENT= A C library for writing XML 1.0/1.1 files or streams
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 9247765d3df0..86b77533a576 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -17,8 +17,8 @@ COMMENT= Lightweight XML Parser
USE_AUTOTOOLS= libtool
USE_ICONV= 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
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile
index 8f9b7efdc748..9af2035d6510 100644
--- a/textproc/libtranslate/Makefile
+++ b/textproc/libtranslate/Makefile
@@ -19,9 +19,8 @@ USE_GNOME= glib20 gnomehack intlhack
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
OPTIONS= GENERIC "generic module" on \
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 350d6395d7c8..99bf1ef0fcc4 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -51,10 +51,8 @@ CFLAGS+= -Wuninitialized -ffast-math -finline-functions \
.endif
.if defined(WITH_PGO)
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fprofile-generate" \
- LDFLAGS="${LDFLAGS} -fprofile-generate"
-.else
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -fprofile-generate
+CFLAGS+= -fprofile-generate
.endif
post-patch:
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 50f342349732..bc50b926318a 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -36,8 +36,8 @@ CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
--with-html-dir=${PREFIX}/share/doc \
--with-html-subdir=${PORTNAME} \
--without-python
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(MASTERDIR)
MAN1= xml2-config.1 xmllint.1 xmlcatalog.1
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 8ffa4591eab1..fc36313fd475 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
post-patch:
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 63d3696b6b0b..6b93f871d1ba 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -25,8 +25,8 @@ USE_LDCONFIG= yes
USE_GNOME?= gnomehack libxml2
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--without-python
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(MASTERDIR)
_SLAVE_PORT= yes
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index c5aa296b1c2d..fe72a711bc44 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG= yes
USE_DOS2UNIX= yes
USE_CSTD= gnu99
CFLAGS+= ${PTHREAD_CFLAGS}
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-pthreads \
--disable-java-bindings \
--disable-hunspell \
diff --git a/textproc/ltxml/Makefile b/textproc/ltxml/Makefile
index 872bdba27886..e28140e4ac50 100644
--- a/textproc/ltxml/Makefile
+++ b/textproc/ltxml/Makefile
@@ -19,7 +19,6 @@ USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib=/usr --enable-multi-byte
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ltxml.1 xmlnorm.1 pesis.1 sgcount.1 sggrep.1 sgmlsb.1 \
sgmlseg.1 sgmltoken.1 sgmltrans.1 sgrpg.1 textonly.1 \
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index c85b166d45a4..4a210aba97ff 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -17,7 +17,6 @@ USE_GNOME= gnomehack
USE_BISON= build
USE_ICONV= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --without-unac
USE_LDCONFIG= yes
@@ -31,8 +30,8 @@ MAN3= WordContext.3 WordList.3 WordDict.3 WordListOne.3 \
WordCursorOne.3 WordMonitor.3 Configuration.3 mifluz.3
INFO= mifluz
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE -pthread|${PTHREAD_CFLAGS}|g' \
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 147a0d3e77b5..f2c32464bd43 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -39,7 +39,8 @@ CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \
.if defined(WITH_MYSQL)
CONFIGURE_ARGS+=--with-mysql
.endif
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= modlogan.1
DOC1= faq.txt glosar manual.txt translations.txt \
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index 044c35e7daff..4139af8aec4c 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -19,8 +19,9 @@ LIB_DEPENDS= tre:${PORTSDIR}/textproc/libtre \
utf8proc:${PORTSDIR}/textproc/utf8proc
RUN_DEPENDS= iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" \
- ac_cv_lib_tre_regwcomp=yes
+CONFIGURE_ENV= ac_cv_lib_tre_regwcomp=yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include"
GNU_CONFIGURE= yes
USE_TK_RUN= yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 955b68657837..8afe6047ca0c 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -56,7 +56,6 @@ post-install:
# Therefore, we'd better remove all machine optimizations and any -O
# other than -O{0,1,}. Idea taken from palm/prc-tools-gcc.
CPPFLAGS:= -O ${CFLAGS:N-O*:N-m*}
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.post.mk>
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index edcb517b8caf..118e9064595f 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -22,8 +22,8 @@ USE_PERL5= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
--datadir=${PREFIX}/share/sgml/openjade \
--disable-doc-build
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index ad476f7eb4c0..90d979570b89 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -23,7 +23,6 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-shared
MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
MAKE_JOBS_UNSAFE=yes
diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile
index 85e57458cdee..b4b545d3a0bc 100644
--- a/textproc/pecl-ctemplate/Makefile
+++ b/textproc/pecl-ctemplate/Makefile
@@ -25,8 +25,8 @@ USE_PHPEXT= yes
DEFAULT_PHP_VER= 5
IGNORE_WITH_PHP= 4
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS}
CONFIGURE_ARGS= --with-cTemplate=${LOCALBASE}
diff --git a/textproc/pecl-xdiff/Makefile b/textproc/pecl-xdiff/Makefile
index 8f84c9342a8f..4418ce6f330a 100644
--- a/textproc/pecl-xdiff/Makefile
+++ b/textproc/pecl-xdiff/Makefile
@@ -22,7 +22,6 @@ USE_PHP= yes
USE_PHPEXT= yes
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
post-configure:
echo "#define HAVE_XDL_ALLOCATOR_PRIV 1" >>${WRKSRC}/config.h
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 0fa0a258fc8e..ddf4f9adf02f 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -25,6 +25,6 @@ WX_COMPS= python:run
PYDISTUTILS_PKGNAME= pyenchant
-MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/textproc/py-hyperestraier/Makefile b/textproc/py-hyperestraier/Makefile
index a09e25e90723..dee3791ebcc0 100644
--- a/textproc/py-hyperestraier/Makefile
+++ b/textproc/py-hyperestraier/Makefile
@@ -27,7 +27,6 @@ PYDISTUTILS_PKGVERSION= 0.01
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
pre-patch:
@${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_VERSION}|' \
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 223fdef5a722..403f488b9dd0 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -37,8 +37,8 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-convert-dir=${LOCALBASE}/share/omf \
--datadir=${PREFIX}/share \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|/lib/rarian|/db/rarian|' \
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 008b1a8515f9..00ff3b2ff49f 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -23,9 +23,8 @@ USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-raptor=system
USE_LDCONFIG= yes
diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile
index f65316144378..b503a36c5358 100644
--- a/textproc/rast/Makefile
+++ b/textproc/rast/Makefile
@@ -31,7 +31,8 @@ CONFIGURE_ARGS= \
--with-ruby=${LOCALBASE}/bin/ruby \
--with-default-encoding=${DEFAULT_ENCODING} \
--with-filter-moduledir=${PREFIX}/lib/rast/filters
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="-lz"
+LDFLAGS+= -lz
+CFLAGS+= -I${LOCALBASE}/include
USE_LDCONFIG= YES
MAKE_JOBS_UNSAFE= yes
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index d6d5a29d3f81..faf995f0b2fd 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -26,9 +26,8 @@ USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-raptor=system \
--with-threestore=no
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 5df34748e8fa..ee9247b7707f 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -27,8 +27,9 @@ USE_LDCONFIG= yes
SHLIB_MAJOR= 70 # API changes counter
PLIST_SUB+= SHLIB_MAJOR="${SHLIB_MAJOR}"
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
- LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
+CONFIGURE_ENV= LIBTOOL=${LIBTOOL}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lexpat -liconv
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 281f0107041c..35400304f3d9 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -17,8 +17,8 @@ USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= sagasu.1
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index 0f499bcc57fb..be8b9dc1eba2 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SCEW_EXAMPLES= print stream write
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index a8309e4fc8c7..acd00fa29f49 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_LDCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib
DESKTOP_ENTRIES="SCIM Input Pad" \
"${COMMENT}" \
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 75e7b8bfd429..1ff4b45a9c6c 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -33,7 +33,6 @@ USE_ICONV= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
DOCSDIR= ${PREFIX}/share/doc/kmfl/${PORTNAME}
PORTDOCS= AUTHORS COPYING ChangeLog
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 8def822922c6..ec9135a12d87 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -28,8 +28,8 @@ USE_GNOME= pkgconfig
USE_GETTEXT= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
- OV_MODULEDIR=${PREFIX}/lib/openvanilla/
+CONFIGURE_ENV+= OV_MODULEDIR=${PREFIX}/lib/openvanilla/
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_FILES= lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.a \
lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.la \
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 48d330a2c8ac..cc7d6d361cea 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -27,10 +27,10 @@ MAN1= scim-make-table.1
.include <bsd.port.pre.mk>
-CPPFLAGS= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- PREFIX="${PREFIX}"
+CONFIGURE_ENV+= PREFIX="${PREFIX}"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
PLIST_SUB= SKIM="@comment "
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index ca20d921045f..588b8fea6cfd 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
.include <bsd.port.pre.mk>
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
post-patch:
${REINPLACE_CMD} -e '/^libscim@SCIM_EPOCH@_la_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 63a7fdb8da5d..5fd8b3537657 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -39,9 +39,9 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share \
--with-omfdirs=${PREFIX}/share/omf \
--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" \
LOCALBASE="${LOCALBASE}"
+CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB= LOCALBASE=${LOCALBASE}
MAN1= scrollkeeper-config.1 scrollkeeper-gen-seriesid.1
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 701e0ce95107..18c49bc80542 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -25,7 +25,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/textproc/senna/Makefile b/textproc/senna/Makefile
index 7e7062360711..1183c312dce2 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_LDCONFIG= YES
CONFIGURE_ARGS= --with-sennahome=${SENNA_HOME}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAKE_ARGS= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index c540a3850fc8..4848ab6a6b6e 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -26,10 +26,9 @@ PYDISTUTILS_NOEGGINFO= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
- PREFIX="${PREFIX}" \
- CXXFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -lintl"
-
+ PREFIX="${PREFIX}"
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
+CXXFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ ${CFLAGS}
.include <bsd.port.pre.mk>
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index 755935af182e..1de3aff716c4 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man
USE_GNOME= pkgconfig
USE_SQLITE= 3
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- ac_cv_path_CPPUNIT_CONFIG=no \
+CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \
ac_cv_path_PYTHON=no \
ac_cv_path_SWIG=no \
ac_cv_prog_HAVE_DOT=no \
@@ -30,8 +29,8 @@ USE_LDCONFIG= yes
MAN1= soothsayer_demo.1 soothsayer_demo_text.1 \
soothsayer_simulator.1 text2ngram.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORT_VERBS= ${PORTNAME} text2ngram
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 6b6979437d38..2a3301543bd1 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile
index a572e31bb145..36440b87c5a8 100644
--- a/textproc/spellutils/Makefile
+++ b/textproc/spellutils/Makefile
@@ -18,9 +18,9 @@ COMMENT= Programs used to isolate some parts or texts before spell-checking
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS='-L${LOCALBASE}/lib' \
- LDFLAGS=-lintl
+CONFIGURE_ENV= LIBS='-L${LOCALBASE}/lib'
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lintl
MAN1= pospell.1 newsbody.1
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index bf3413fd6eda..9b8d7341da1b 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -94,7 +94,7 @@ SPHINX_LOG?= /var/log/${PORTNAME}
# don't ask.
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+= ${CXXFLAGS}
CFGFILE= ${PREFIX}/etc/sphinx.conf
USE_RC_SUBR= sphinxsearch.sh
SUB_LIST+= PORTNAME=${PORTNAME} \
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index c270be966b73..5351de6d68f1 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -111,7 +111,7 @@ SPHINX_LOG?= /var/log/${PORTNAME}
# don't ask.
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CC=${CC} CPPFLAGS="${CXXFLAGS}"
+CPPFLAGS+= ${CXXFLAGS}
CFGFILE= ${PREFIX}/etc/sphinx.conf
USE_RC_SUBR= sphinxsearch.sh
SUB_LIST+= PORTNAME=${PORTNAME} \
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index 39a84a92ce74..439c5bc9935c 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= delphij@FreeBSD.org
COMMENT= A cross-platform and international dictionary written in Gtk2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index 4448e309d173..17168e764290 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
DOCS= AUTHORS README NEWS docs/*.pdf license/LICENSING.txt
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index daa732591eb9..a45d97c92b25 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -35,8 +35,9 @@ BUILD_WRKSRC= ${WRKSRC}/emacs
INSTALL_WRKSRC= ${WRKSRC}/emacs
CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-CONFIGURE_ENV= EMACS="${EMACS_CMD}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV= EMACS="${EMACS_CMD}" \
LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim-el
PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index 7ab7f3a84bb6..d041cdfdff36 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS= uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
-CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= `pkg-config --cflags libgnomeui-2.0`
CONFIGURE_ARGS= --with-gtk2 --enable-gnome-applet
UIM_SLAVE= yes
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 9b3e9cca8599..944b6ffbebbf 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -22,11 +22,10 @@ PKGDIR= ${.CURDIR}
CONFIGURE_ARGS= --with-qt --enable-pref --enable-default-toolkit=qt \
--enable-kde-applet
CONFIGURE_ENV= QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+ LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index 2d452af4b907..8c56fab16539 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -23,10 +23,10 @@ MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
CONFIGURE_ARGS= --with-qt4 --enable-pref --enable-default-toolkit=qt4 \
--enable-kde4-applet
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+CONFIGURE_ENV= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt4_toolbar_CMakeLists.txt
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 207f92683bad..002a264c1db4 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -19,10 +19,10 @@ PKGDIR= ${.CURDIR}
CONFIGURE_ARGS= --with-qt --enable-pref --enable-default-toolkit=qt \
--disable-kde-applet
CONFIGURE_ENV= QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+ LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CXXFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in \
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index 9be3f428f2ff..dac05fa60292 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -20,10 +20,10 @@ MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- DATADIRNAME="share"
+CONFIGURE_ENV= DATADIRNAME="share"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
UIM_SLAVE= yes
.if defined(WITHOUT_X11)
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d1d728bf4325..31cb7571dead 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -40,9 +40,9 @@ CONFIGURE_ARGS+= --with-gtk2
CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime
.endif
-CONFIGURE_ENV?= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.if !defined(UIM_SLAVE)
.if !defined(WITHOUT_X11)
diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 121521c55ddd..2f5c2c639320 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -17,7 +17,6 @@ LICENSE= GPLv3
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --libdir=${PREFIX}/share
MAN1= unrtf.1
diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile
index 1eca4fb08f72..83ab133bbea5 100644
--- a/textproc/webcpp/Makefile
+++ b/textproc/webcpp/Makefile
@@ -17,7 +17,8 @@ COMMENT= Convert your source code to syntax highlighted HTML
.include <bsd.port.pre.mk>
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WANT_FINAL)
CONFIGURE_ARGS+= --enable-final
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 359de7cd3a82..b93ee633a6e6 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" MKDIR_P="${MKDIR}"
+CONFIGURE_ENV= MKDIR_P="${MKDIR}"
CONFIGURE_ARGS= --with-png=${LOCALBASE} \
--with-libwmf=${LOCALBASE}
MAKEFILE= GNUmakefile
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 9d310165fb4d..fcadeb66015b 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -107,8 +107,7 @@ MAKE_ENV+= ICUROOT=${ICUROOT}
PLIST_SUB+= ICUDEP=""
.else
USE_ICONV= yes
-CONFIGURE_ENV+= LDFLAGS='-L${LOCALBASE}/lib -liconv'
-MAKE_ENV+= LDFLAGS='-L${LOCALBASE}/lib -liconv'
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
PLIST_SUB+= ICUDEP="@comment "
.endif
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 655cb32a0a77..d07adcf46542 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole \
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lcole"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lcole
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 6c99c050ae6a..c20e1f1e21f6 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/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/textproc/xqilla/Makefile b/textproc/xqilla/Makefile
index f9dd9823d27d..f7cbd4367ca9 100644
--- a/textproc/xqilla/Makefile
+++ b/textproc/xqilla/Makefile
@@ -21,6 +21,6 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 71f1ca279cb6..f673fceb8ce7 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -140,8 +140,8 @@ CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
.if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT)
CONFIGURE_ENV+= \
- INCLUDES=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+ INCLUDES=-I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile
index 51de570ee290..3e0fef84477b 100644
--- a/www/apache13-modperl/Makefile
+++ b/www/apache13-modperl/Makefile
@@ -122,7 +122,7 @@ OPTIM+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}' \
+CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}'
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index cea4e55b1e40..737d451ebb08 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -293,9 +293,7 @@ EXTRA_PATCHES+= ${FILESDIR}/logresolve.c.patch
EXTRA_PATCHES+= ${FILESDIR}/rotatelogs.c.patch
.endif
-CONFIGURE_ENV= CFLAGS='${CFLAGS}' \
- LDFLAGS='${LDFLAGS}' \
- OPTIM='${OPTIM}' \
+CONFIGURE_ENV= OPTIM='${OPTIM}' \
SSL_BASE='${OPENSSLBASE}' \
EAPI_MM='SYSTEM' \
PATH="${PREFIX}/bin:${PATH}"
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 33d0d42ea965..dead6cc16df4 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -141,8 +141,8 @@ CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
.if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT)
CONFIGURE_ENV+= \
- INCLUDES=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+ INCLUDES=-I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
MAN1= dbmmanage.1 htdigest.1 htpasswd.1
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 8d911240ab2d..19616ae45a40 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -84,9 +84,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= \
- CC="${CC}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
CONFIG_SHELL="${SH}" \
LOCALBASE="${LOCALBASE}"
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 379d94b3518b..6fdea35a220b 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -82,10 +82,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config
-CONFIGURE_ENV= \
- CC="${CC}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV= \
CONFIG_SHELL="${SH}" \
LOCALBASE="${LOCALBASE}"
diff --git a/www/aria/Makefile b/www/aria/Makefile
index 92d21061dce1..717857e2a25e 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -28,11 +28,10 @@ USE_GNOME= gtk12
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PORTDOCS= README README.euc
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS+= -L${LOCALBASE}/lib
post-extract:
@${RM} -f ${WRKSRC}/src/getopt*
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index 07330bddcea0..bffe79aef058 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -34,10 +34,9 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \
--with-font-label=${FONTLABEL} \
--with-etcdir=${PREFIX}/etc
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= awffull.1
MAN5= awffull.conf.5
diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index e28b472a066a..004320a8bc56 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -37,8 +37,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
WANT_GNOME= 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-freedesktop_org-menu=${PREFIX}/share/applications \
--with-freedesktop_org-mime=${PREFIX}/share/mime \
--without-gnome2_4-mime \
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 2a9ff736c668..19057cfe1681 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
WANT_GNOME= 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-freedesktop_org-menu=${PREFIX}/share/applications \
--with-freedesktop_org-mime=${PREFIX}/share/mime \
--without-gnome2_4-mime \
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 7a01af8d3528..3d68b3491374 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -51,8 +51,8 @@ CONFIGURE_ARGS+= --without-perl
LIB_DEPENDS+= clamav.7:${PORTSDIR}/security/clamav
PLIST_SUB+= CLAMAV=""
CONFIGURE_ARGS+= --with-clamav
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
.else
PLIST_SUB+= CLAMAV="@comment "
CONFIGURE_ARGS+= --without-clamav
diff --git a/www/cacheboy15-devel/Makefile b/www/cacheboy15-devel/Makefile
index 394bcf804f84..7dd334da3fac 100644
--- a/www/cacheboy15-devel/Makefile
+++ b/www/cacheboy15-devel/Makefile
@@ -350,10 +350,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
# Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}"\
- LDFLAGS="${LDFLAGS}"
-
PLIST_DIRS= etc/squid/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git a/www/cacheboy16/Makefile b/www/cacheboy16/Makefile
index 0707b0e04fcd..c36d49f003b3 100644
--- a/www/cacheboy16/Makefile
+++ b/www/cacheboy16/Makefile
@@ -353,10 +353,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
# Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}"\
- LDFLAGS="${LDFLAGS}"
-
PLIST_DIRS= etc/squid/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 82a94e2050e0..8ab983662bb5 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -18,7 +18,6 @@ COMMENT= Commandline client for DAV
LIB_DEPENDS= neon:${PORTSDIR}/www/neon29
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-netrc
ALL_TARGET= cadaver
MAKE_JOBS_SAFE= yes
@@ -37,8 +36,8 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - \
--exclude 'glob.[ch]' --exclude 'mkstemp.[ch]' \
--exclude 'tempname.[ch]' --exclude 'basename.[ch]'
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_OPENSSL)
USE_OPENSSL= yes
diff --git a/www/castget/Makefile b/www/castget/Makefile
index 8f67dc575694..2b380d10869f 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -21,7 +21,6 @@ USE_LDCONFIG= yes
USE_GNOME= glib20 libxml2
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-static
GNU_CONFIGURE= yes
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index df8dc7beb6a0..0638364b07b3 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -55,9 +55,8 @@ USE_RC_SUBR= cherokee.sh
SUB_FILES= pkg-install pkg-message
USE_GMAKE= 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}
CHEROKEE_VARDIR?= /var
CHEROKEE_LOGDIR?= ${CHEROKEE_VARDIR}/log
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index 70fa821d9eb8..3c5b7554f036 100644
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -17,8 +17,8 @@ COMMENT= An application to help CSS style sheets creation and maintenance
USE_GNOME= gnomehack gtk20 libxml2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-plugin-headers
MAN1= cssed.1
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 357dececdc7d..cb0ab197b9e5 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -39,8 +39,6 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-cookies --enable-threaded-dns \
--libdir=${PREFIX}/libexec
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index d40967b7b89f..7ae3d16beace 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -28,8 +28,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-cookies --enable-threaded-dns \
--libdir=${PREFIX}/libexec
.if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6)
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index b472c6028092..4c175ce26e8b 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -80,7 +80,6 @@ USE_LUA= 5.0
CONFIGURE_ARGS+= --with-lua
CPPFLAGS+= -I${LUA_INCDIR}
LDFLAGS+= -L${LUA_LIBDIR}
-CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}"
.else
CONFIGURE_ARGS+= --without-lua
.endif
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 76960b127143..0a56616b6061 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -27,8 +27,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
EPHY_EXTENSIONS=really-all
EPHY_VERSION= ${PORTVERSION:R}
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 82eff476205c..6893b5b8cebb 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -41,8 +41,8 @@ USE_GMAKE= yes
INSTALLS_OMF= yes
CONFIGURE_ARGS+=--enable-introspection \
--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}
GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 05f7fd376d55..7cd5dfd275ea 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -22,8 +22,8 @@ USE_GETTEXT= yes
USE_PERL5= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= evolution-webcal.schemas
diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile
index a8067151b9cb..c3a5c926978d 100644
--- a/www/ffproxy/Makefile
+++ b/www/ffproxy/Makefile
@@ -16,8 +16,8 @@ COMMENT= Filtering HTTP proxy server
BROKEN= does not fetch
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN5= ${PORTNAME}.conf.5
MAN7= ${PORTNAME}.quick.7
diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile
index 6214b1769f25..64d7f3a4197d 100644
--- a/www/flashplugin-mozilla/Makefile
+++ b/www/flashplugin-mozilla/Makefile
@@ -28,8 +28,8 @@ USE_XORG= xt x11 xext
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-plugin-dir="${WEBPLUGINS_DIR}"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lXt"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lXt
CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME}
USE_WEBPLUGINS= native
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 2edc2cc61793..9b18c7538a2b 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -23,7 +23,7 @@ USE_AUTOTOOLS= autoconf libtool:env
CONFIGURE_ARGS= --disable-shared \
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config
-CONFIGURE_ENV= LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+= -L${PREFIX}/lib
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index b5f677042783..23c1762f212a 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -26,8 +26,8 @@ USE_GECKO= libxul
USE_WEBPLUGINS= native
WEBPLUGINS_FILES= ${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \
${PORTNAME}-wmp.so ${PORTNAME}.so
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-plugin_dir="${WEBPLUGINS_DIR}"
PORTDOCS= README COPYING AUTHORS ChangeLog INSTALL NEWS javascript.txt
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index ebd00c733283..8a7301774fdd 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= desktop_gnome_file_sharing.schemas
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index fda516dfdf4c..97a9f106e576 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -25,14 +25,13 @@ USE_GNOME= gconf2 gnomehack gnomeprefix
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-silent-rules \
--with-gtk=2.0
GCONF_SCHEMAS= thumbnailer.schemas
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 8bb25d59c711..4a8c99e92a00 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -32,8 +32,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="3.14"
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 6933971b7807..c9b6d45decf0 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -25,8 +25,8 @@ OPTIONS= CROCO "Use CROCO library for CSS2 validation" off \
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
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.pre.mk>
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index e4d9603ab851..ef11b7cf5a68 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -27,10 +27,9 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var webrootdir=${WWWDIR}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= COMMAND "Enable the Hiawatha CommandChannel" Off \
CACHE "Internal file caching support" On \
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index cc13b8018f5b..713edec1de35 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -22,10 +22,9 @@ USE_RC_SUBR= hydra.sh
NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
LOGDIR?= /var/log/hydra
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 220c5f35e73d..1d784c36eb8c 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -36,8 +36,8 @@ OPTIONS= MYSQL "Enable MySQL support" off \
.include <bsd.port.options.mk>
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITH_MYSQL)
USE_MYSQL= yes
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index fdb71907146a..c51b11b9c8fd 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -28,9 +28,9 @@ USE_GECKO= libxul
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gecko_engine=${GECKO}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
- -I${LOCALBASE}/include/nspr" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+ -I${LOCALBASE}/include/nspr
MAN1= kazehakase.1
OPTIONS= WEBKIT "Webkit Backend (along with Gecko)" On
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index d4489817113b..cb5f18dbb217 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -24,8 +24,8 @@ USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gtk20
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= --enable-static
.include <bsd.port.mk>
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 0c619cb697f8..7a48d2eaf996 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 003adae91a35..91139ecf96c3 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -37,8 +37,6 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd --enable-static
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-
.if !defined(_BUILDING_LIGHTTPD_MODULE)
USE_RC_SUBR= lighttpd.sh
diff --git a/www/links/Makefile b/www/links/Makefile
index 0aed617b9038..59de9a2cad94 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= links-0*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl --without-pmshell --without-atheos \
--without-gpm --without-fb
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_OPENSSL= yes
diff --git a/www/lusca-head/Makefile b/www/lusca-head/Makefile
index 3f30c86bc0bc..ec3d08a9f280 100644
--- a/www/lusca-head/Makefile
+++ b/www/lusca-head/Makefile
@@ -346,10 +346,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
# Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
- CPPFLAGS="${CPPFLAGS}"\
- LDFLAGS="${LDFLAGS}"
-
PLIST_DIRS= etc/squid/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git a/www/middleman/Makefile b/www/middleman/Makefile
index c305127ec683..03b88fd2c227 100644
--- a/www/middleman/Makefile
+++ b/www/middleman/Makefile
@@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
USE_GMAKE= 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}
MAN8= mman.8
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 010dcd443073..3dc790319c9d 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -26,8 +26,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-libnotify \
--enable-addons \
--enable-docs \
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 673d17007739..d071dd0ad588 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -40,8 +40,6 @@ CPPFLAGS+= -I${LOCALBASE}/include \
${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib \
${PTHREAD_LIBS}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
post-patch:
@${REINPLACE_CMD} -e 's,REG_EXTENDED,AP_REG_EXTENDED,' \
diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile
index 7181bb1a4f97..b0994be59946 100644
--- a/www/mod_dnssd/Makefile
+++ b/www/mod_dnssd/Makefile
@@ -22,10 +22,10 @@ MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
USE_APACHE= 22+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
+CONFIGURE_ENV= APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-lynx
post-install:
diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile
index 1a6665b826b7..3b2f84555ddb 100644
--- a/www/mod_encoding/Makefile
+++ b/www/mod_encoding/Makefile
@@ -36,9 +36,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--includedir=${APACHEINCLUDEDIR} \
--with-apxs=${APXS}
-CONFIGURE_ENV= CPPFLAGS='-I${APACHEINCLUDEDIR} -I${LOCALBASE}/include' \
- LIBS='-L${LOCALBASE}/lib' \
+CONFIGURE_ENV= LIBS='-L${LOCALBASE}/lib' \
PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}"
+CPPFLAGS+= -I${APACHEINCLUDEDIR} -I${LOCALBASE}/include
PLIST_FILES= ${APACHEMODDIR}/mod_encoding.so
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index f9a2efca3af0..530efe0f854e 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -31,7 +31,8 @@ MAKE_JOBS_SAFE= yes
USE_APACHE= 20+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-apxs=${APXS} \
--disable-libFLACtest --disable-vorbistest
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 4002d001fc97..d75b796d2b9c 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -24,7 +24,6 @@ USE_PERL5_BUILD= yes
CONFIGURE_ARGS= --with-apxs="${APXS}"
CFLAGS+= -DONIG_ESCAPE_REGEX_T_COLLISION
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
MAKE_ARGS= RUBY="${RUBY}"
INSTALL_TARGET= site-install
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 7a12a58d56fd..d36db55014c2 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -22,13 +22,12 @@ USE_GNOME= gnomehier gtk12
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} --disable-gnome
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-install:
${INSTALL_DATA} ${WRKSRC}/nscache.desktop \
diff --git a/www/oops/Makefile b/www/oops/Makefile
index c4773a542e91..daf7b949fe6c 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -28,10 +28,10 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
--libdir=${PREFIX}/libexec/oops \
--enable-oops-user=oops \
--enable-large-files
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" \
- CXXFLAGS="${CXXFLAGS} -fPIC" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CFLAGS+= -fPIC
+CXXFLAGS+= -fPIC
OOPSVAR= /var/run/oops
OOPSLOG= /var/log/oops
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index a0ca7d08fee1..7e9769d3c2d5 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -30,10 +30,10 @@ USE_JAVA= yes
GNU_CONFIGURE= yes
LIBTOOLFILES= configure
CONFIGURE_ARGS= --enable-gecko-rpath
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}" \
- LDFLAGS="-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
LIBS="-lm" BOOST_LIB_SUFFIX=""
+CPPFLAGS+= -I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}
+LDFLAGS+= -L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GECKO= libxul
diff --git a/www/pecl-amfext/Makefile b/www/pecl-amfext/Makefile
index 07f7201d3b04..c8726c1fb277 100644
--- a/www/pecl-amfext/Makefile
+++ b/www/pecl-amfext/Makefile
@@ -21,6 +21,6 @@ USE_PHPEXT= yes
PHP_MODNAME= amf
CONFIGURE_ARGS= --enable-amf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/php/ext/standard"
+CPPFLAGS+= -I${LOCALBASE}/include/php/ext/standard
.include <bsd.port.mk>
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index a2dca3796ee4..1c00141410d7 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -32,8 +32,8 @@ CONFLICTS= privoxy-devel-[0-9]*
MAN1= privoxy.1
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \
- CPPFLAGS=-I${LOCALBASE}/include/
+CPPFLAGS+= -I${LOCALBASE}/include/
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= ACCEPT_FILTER "Enable support for accf_http(9)" Off \
DEBUG "Build with debugging symbols" Off \
diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index d7960f5f6b41..b59fb2d3ccb6 100644
--- a/www/resin2/Makefile
+++ b/www/resin2/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
# We need to link with cc instead of ld for the FreeBSD specific options used
# by threading libraries
-CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS}
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 5292864300d4..1dc86dcc384c 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
# We need to link with cc instead of ld for the FreeBSD specific options used
# by threading libraries
-CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL}
+CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL}
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 80b31f07e266..cc8230fe9137 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -17,7 +17,6 @@ COMMENT= An interactive, multi-threaded web browser for text terminals
USE_GETTEXT= yes
HAS_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --path-archprefix=${PREFIX} --path-prefix=${PREFIX} \
--enable-i18n --enable-local-cgi --enable-ipv6
@@ -29,8 +28,8 @@ PLIST_FILES= bin/retawq \
share/locale/pt_BR/LC_MESSAGES/retawq.mo
PORTDOCS= *
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITH_GNUTLS)
LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
diff --git a/www/rsstail/Makefile b/www/rsstail/Makefile
index 62711d4f4c45..6b79f27b82f5 100644
--- a/www/rsstail/Makefile
+++ b/www/rsstail/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= mrss.19:${PORTSDIR}/textproc/libmrss
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/${PORTNAME}
MAN1= ${PORTNAME}.1
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 7798489fb671..868470cc1a4f 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --sysconfdir="${PREFIX}/etc/${PORTNAME}" \
--enable-sargphp="${PREFIX}/etc/${PORTNAME}" \
--enable-fontdir="${PREFIX}/etc/${PORTNAME}/fonts" \
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 17ae89afa65c..cb6aff16b70b 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= desktopfileutils gnomehack gnomemenus gnomeprefix \
USE_XORG= xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_OMF= yes
GCONF_SCHEMAS= screem.schemas
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 56a79a73c1d5..4bfd8ac24b7e 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -32,7 +32,7 @@ USE_GL= gl
MAKE_JOBS_SAFE= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo"
+CPPFLAGS+= -I${LOCALBASE}/include/cairo
USE_GCC= 4.2+
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 2976814efa38..beff894f3f9d 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -32,8 +32,9 @@ ALL_TARGET= default
MAKE_JOBS_SAFE= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include/cairo" \
+CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \
ac_cv_func__Unwind_Backtrace=no
+CPPFLAGS+= -I${LOCALBASE}/include/cairo
USE_GCC= 4.2+
MOZ_EXTENSIONS= default
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 1cdfdb364a48..1171e7fe2e72 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -384,8 +384,7 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
# Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- GREP="${GREP}"
+CONFIGURE_ENV+= GREP="${GREP}"
PLIST_DIRS= %%ETCDIR%%/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 009371d99f1a..ff31ee019a8c 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -387,8 +387,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
# Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-
PLIST_DIRS= %%ETCDIR%%/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index c5fdd6a15c24..9df1f85d1e42 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -415,8 +415,6 @@ WITH_DEBUG?= yes
# Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-
PLIST_DIRS= %%ETCDIR%%/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
diff --git a/www/srg/Makefile b/www/srg/Makefile
index e94663bc0b14..e6e2ac899f0b 100644
--- a/www/srg/Makefile
+++ b/www/srg/Makefile
@@ -19,7 +19,6 @@ USE_GMAKE= yes
USE_BISON= build
USE_BZIP2= yes
NO_INSTALL_MANPAGES= yes
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e 's|-g |${CFLAGS} ${CPPFLAGS} |' ${WRKSRC}/Makefile \
diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index 562722852901..410db2484c69 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -21,15 +21,15 @@ USE_ICONV= yes
USE_CSTD= gnu89
PATCH_STRIP= -p1
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS+= --localstatedir=/var
.if defined(WITH_GNUTLS)
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls
CONFIGURE_ARGS+= --with-ssl=gnutls
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
.else
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-ssl=openssl
.endif
diff --git a/www/tokyopromenade/Makefile b/www/tokyopromenade/Makefile
index 093c839424fa..0d5f74739e9d 100644
--- a/www/tokyopromenade/Makefile
+++ b/www/tokyopromenade/Makefile
@@ -32,7 +32,7 @@ MAN1= prommgr.1
.if defined(WITH_LUA)
CONFIGURE_ARGS+= --enable-lua
-CONFIGURE_ENV+= LDFLAGS="-L${LUA_LIBDIR}"
+LDFLAGS+= -L${LUA_LIBDIR}
CFLAGS+= -I${LUA_INCDIR}
USE_LUA= yes
.endif
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 12bfce8852a1..cd5e6510ad11 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -28,7 +28,7 @@ USE_TCL= yes
USE_RC_SUBR= ${PORTNAME}
USE_LDCONFIG= yes
-LDFLAGS= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-expat=${LOCALBASE} \
--with-pcre=${LOCALBASE}
diff --git a/www/ump/Makefile b/www/ump/Makefile
index e6aef9cdd330..5b390b71fb7a 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -36,7 +36,7 @@ TIMIDITY_VERSION= 2.13.2
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ump --with-default-path=${LOCALBASE}/share/timidity
-CONFIGURE_ENV= LDFLAGS=-export-dynamic
+LDFLAGS+= -export-dynamic
USE_GMAKE= yes
USE_XORG= xpm xmu
WANT_GNOME= yes
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index f44c7f3f82be..3c70d0aea86e 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -87,7 +87,7 @@ CONFIGURE_ARGS+= --enable-dns \
--with-gdlib=${LOCALBASE}/lib \
--with-gd=${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib"
+LDFLAGS+= -L${PREFIX}/lib
CFLAGS+= -Wall
MAN1= ${PKGNAMEPREFIX}webalizer.1 ${PKGNAMEPREFIX}wcmgr.1
DOC1= CHANGES Copyright INSTALL \
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 2a6de9ac0673..e95843bca9a2 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -36,10 +36,10 @@ USE_GNOME= gtk20 libxslt ltverhack
USE_PERL5= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
+CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
ac_cv_path_DOLT_BASH=""
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-icon-database \
--with-gtk=2.0 \
--enable-svg \
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 32b9a7a8459c..39463416bd0f 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -85,8 +85,4 @@ post-install:
@${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/mod_${MODULENAME}.so"
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile
index 4fca899c3ca9..144584732452 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src
ALL_TARGET= install
NO_INSTALL_MANPAGES= yes
-CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${OPENSSLINC}" \
- LIBS=-L${OPENSSLLIB}
+CONFIGURE_ENV= LIBS=-L${OPENSSLLIB}
+CFLAGS+= -I${OPENSSLINC}
do-install:
@${RMDIR} ${WRKSRC}/../bin/runs
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index a93473ff82be..3c679326edf4 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -16,9 +16,8 @@ COMMENT= C++ WSDL Parser
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile
index 699abc152936..10b6d45c546a 100644
--- a/www/xapian-omega/Makefile
+++ b/www/xapian-omega/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_PERL5_RUN= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= omindex.1 scriptindex.1
diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile
index c53e9d58b3d0..bf2a48990a35 100644
--- a/www/ziproxy/Makefile
+++ b/www/ziproxy/Makefile
@@ -24,8 +24,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-cfgfile="${PREFIX}/etc/ziproxy/ziproxy.conf"
diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index 152c567b76ba..f352849b58e5 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -26,7 +26,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/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 58785842520f..937dcd39fd9a 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -26,7 +26,7 @@ MAN1= rclock.1
PLIST_FILES= bin/rclock
-CPPFLAGS= -DMAIL_SPOOL='\"/var/mail/\"'
+CPPFLAGS+= -DMAIL_SPOOL='\"/var/mail/\"'
post-patch:
@${REINPLACE_CMD} \
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index 3c2b18883fe5..fc7eccbb0e4c 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -18,8 +18,8 @@ USE_GNOME= gnomehack gnomeprefix libgnomeui oaf
USE_GMAKE= 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
MAN1= sanduhr.1
diff --git a/x11-fm/FSViewer/Makefile b/x11-fm/FSViewer/Makefile
index 9435ba207f4b..5c0d0c5b4166 100644
--- a/x11-fm/FSViewer/Makefile
+++ b/x11-fm/FSViewer/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
USE_XORG= x11 xmu
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= `pkg-config --cflags WINGs`
-LDFLAGS= `pkg-config --libs WINGs`
+CPPFLAGS+= `pkg-config --cflags WINGs`
+LDFLAGS+= `pkg-config --libs WINGs`
post-install:
${MKDIR} ${PREFIX}/share/doc/FSViewer
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index e1b5f6a7d700..13d291a715f5 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= xpm
USE_GNOME= imlib
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-imlib-icons
MAN1= dfm.1x
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 84adae9dca7a..f2a0d0627bac 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET= install
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-MAKE_ENV= LDFLAGS="${LDFLAGS}" DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
+MAKE_ENV= DOC_DIR="${DOCSDIR}/" MAN_DIR="${MAN1PREFIX}/man/man1"
MAN1= emelfm2.1
OPTIONS= DEBUG "Enable debugging messages" off \
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index dfd8a108e08e..66416f837c50 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -21,10 +21,9 @@ USE_GL= gl
USE_GNOME= gtk12
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-GL-prefix=${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-extract:
-@${RM} ${WRKSRC}/lib/getopt*
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index f37492ff5f1f..9ee078282a29 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -19,13 +19,12 @@ OPTIONS= FAM "File Alteration Monitor Support" off
USE_GNOME= gnomehack gtk20
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- MKDIR_P="${MKDIR}"
+CONFIGURE_ENV= MKDIR_P="${MKDIR}"
MAN1= gentoo.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/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index f0c6e8ca01d0..12e876e4aae8 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool autoconf:env aclocal:env automake:env
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INSTALLS_OMF= yes
MAN1= gnome-commander.1
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 974e2b245b77..7fd22448dbb0 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools
USE_GNOME= gnomehack gtk12
USE_GETTEXT= 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-conffile="${PREFIX}/etc/mtoolsfm.conf"
MAN1= mtoolsfm.1
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 11f846155763..d38f097de580 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -30,9 +30,9 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --enable-static --disable-packagekit
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 348d26724959..f0abbf42b0d1 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -23,7 +23,6 @@ USE_GMAKE= yes
USE_FAM= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
OPTIONS= NLS "Native Language Support (devel/gettext)" on
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 12a9b29934d3..60190c4cf6fa 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -25,9 +25,9 @@ USE_GNOME= pkgconfig
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
-CPPFLAGS= `${pkgconfig_DETECT} --cflags SDL_image glut` \
+CPPFLAGS+= `${pkgconfig_DETECT} --cflags SDL_image glut` \
`${LOCALBASE}/bin/smpeg-config --cflags`
-LDFLAGS= `${pkgconfig_DETECT} --libs SDL_image glut` \
+LDFLAGS+= `${pkgconfig_DETECT} --libs SDL_image glut` \
`${LOCALBASE}/bin/smpeg-config --libs`
.include <bsd.port.pre.mk>
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index e726e097027a..cb7cfe6385ce 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -29,7 +29,6 @@ USE_TK_BUILD= yes
USE_TK= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-tk=${TK_LIBDIR} \
--with-blt=${LOCALBASE} \
@@ -39,7 +38,7 @@ MAKE_ENV= LIB_RUNTIME_DIR="${LOCABASE}/lib"
MAN1= tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
CPPFLAG= -I${LOCALBASE}/include/itcl3.4
-LDFLAGS= -L${LOCALBASE}/lib -litcl
+LDFLAGS+= -L${LOCALBASE}/lib -litcl
post-patch:
@${GREP} -lR "<malloc\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 766dfb74b6c7..e677ea00e4c9 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -23,8 +23,6 @@ USE_GMAKE= yes
CXXFLAGS+= `fltk-config --cxxflags`
LDFLAGS+= `fltk-config --ldflags`
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-
PLIST_FILES= bin/xdiskusage
MAN1= xdiskusage.1
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 8be9e46b6855..dfa4bfb9bb89 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -22,7 +22,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= xfe.1 xfi.1 xfp.1 xfv.1 xfw.1
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 8ed1f5b0adab..6e768b7f0614 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -31,8 +31,8 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_XORG= x11 xext xt
CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= ives.1 xjpegroot.1 xnc.1 xnlaunch.1 iedit.1 iview.1
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index 15bdfc5f5378..2ae2fba0c283 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -22,8 +22,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= x11
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index 826ddc7fbcd9..8a90211123fa 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A program to link multiple X and VNC servers together
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_XORG= x11 xext xrandr xxf86dga ice xinerama xrandr xrender xscrnsaver sm
MAN1= x2vnc.1
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 7329a183eb52..7a1cc921f2a0 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -20,8 +20,8 @@ GNU_CONFIGURE= yes
USE_GNOME= gtk20
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(PORTNAME) && !defined(PKGNAMESUFFIX)
OPTIONS+= ANIMATION "Enable experimental animated progressbars" Off \
diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile
index 6dbf825d6668..b78d74622f96 100644
--- a/x11-themes/emerald-themes/Makefile
+++ b/x11-themes/emerald-themes/Makefile
@@ -21,8 +21,8 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 96133ec15ee0..1a23d014e77b 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -20,7 +20,7 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack
-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/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 87c76b0a0972..03e38ea758b0 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui intlhack
INSTALLS_ICONS= 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/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 517be04f189c..8df56732aabc 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -27,7 +27,7 @@ USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack metacity gtk20
-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/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index f564c14ca440..3da2b0a5607f 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -25,7 +25,8 @@ USE_GNOME= gnomehack gtk20 intlhack ltasneededhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= ANIMATION "Enable experimental animated progressbars" off
diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile
index 6179f54c5dbf..cd65677c66df 100644
--- a/x11-themes/kde-style-lipstik/Makefile
+++ b/x11-themes/kde-style-lipstik/Makefile
@@ -18,7 +18,7 @@ COMMENT= Modified Plastik KDE style
USE_KDEBASE_VER=3
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile
index 6a4af3109465..bb569289bc80 100644
--- a/x11-themes/kde-style-tiblit/Makefile
+++ b/x11-themes/kde-style-tiblit/Makefile
@@ -19,7 +19,7 @@ COMMENT= KDE style focused on customization
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile
index 086c083700b0..7092c48f69e8 100644
--- a/x11-themes/kde-windeco-knifty/Makefile
+++ b/x11-themes/kde-windeco-knifty/Makefile
@@ -18,7 +18,7 @@ COMMENT= Lightweight KDE window decoration
USE_BZIP2= yes
USE_KDEBASE_VER=3
-CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
USE_AUTOTOOLS= libtool
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 5b9385b98ce1..6dce075fb240 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 9224011221a2..c46a7a5fd25d 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gnomeprefix gnomehack gnomedesktop ltverhack intlhack
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-shared --enable-static
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 823169c29eff..24c12b5769e9 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -26,12 +26,12 @@ USE_AUTOTOOLS= autoconf213
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" DEBUGFLAG="${CFLAGS}"
+CONFIGURE_ENV= DEBUGFLAG="${CFLAGS}"
MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib"
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index ee6bb457e9e2..d163325b76bc 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -18,8 +18,8 @@ COMMENT= Text Editor Widgets for the Fast Light ToolKit
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
+CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --enable-shared --with-fltk=${LOCALBASE}
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 8eb0e85429be..e72c29eb675c 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=--enable-threads \
--enable-xft
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index 6742124f1cdb..79fa6cf4f8af 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -59,7 +59,6 @@ CONFIGURE_ARGS+= --enable-jpeg --enable-png --enable-gl --enable-xft \
# fltk2 applications should only be linked statically for now to avoid trouble
# after possibly incompatible updates to fltk2.
CONFIGURE_ARGS+= --disable-shared
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
DOCSDIR= ${PREFIX}/share/doc/fltk2
PORTDOCS= *
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index b469a90c8862..cb5f570741e2 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -32,14 +32,13 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_AUTOTOOLS= libtool
USE_GL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
USE_LDCONFIG= yes
MAN1= shutterbug.1 reswrap.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \
CUPS "Enable CUPS support" off \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 9f521aad34cd..34465c8526cc 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -32,14 +32,13 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GNOME= lthack gnomehack
USE_GL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
USE_LDCONFIG= yes
MAN1= shutterbug.1 reswrap.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= XFT "Enable Xft support" on \
SHM "Enable Shared Memory support" on \
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 3b4350c94d4d..6f3a30a0add9 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -32,11 +32,10 @@ USE_GNOME= gnomehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl=yes
-CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN1= reswrap.1 shutterbug.1 adie.1 PathFinder.1 calculator.1 \
ControlPanel.1
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 8701b3b56fb1..692cb3ea7e36 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -22,8 +22,8 @@ USE_GL= gl
USE_SDL= sdl
USE_GNOME= gnomepanel libgnomeui
GNU_CONFIGURE= yes
-CONFIGURE_ENV= SDLCONF=${SDL_CONFIG} \
- CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`"
+CONFIGURE_ENV= SDLCONF=${SDL_CONFIG}
+CPPFLAGS+= `pkg-config --cflags libgnomeui-2.0`
PLIST_FILES= include/gai/gai.h lib/libgai.so.${PORTVERSION} \
lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc \
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index aac54f26efc2..9d3b9e1baf6f 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -28,8 +28,8 @@ GNOME_HTML_DIR= ${PREFIX}/share/doc/gal
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-static --with-libiconv
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE=yes
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 50832a1bf146..104a82115a80 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -31,8 +31,8 @@ USE_XORG= x11
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-static --with-libiconv
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="2.6" PORTVERSION=${PORTVERSION} \
SHLIBVERSION="2.4"
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index a09734c6b512..72a0d8ee0031 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -20,7 +20,7 @@ USE_GNOME= gnomeprefix gnomehack gtk20
USE_GETTEXT= 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
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 534ee4da601f..f518c2c30645 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_GNUSTEP= yes
USE_GNUSTEP_GUI= yes
USE_GNUSTEP_CONFIGURE= yes
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 3d46e2637e78..e505dc5f8d5e 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -51,7 +51,6 @@ USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
USE_XORG= x11 xt
EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_FLAGS+= OPTFLAG="${CFLAGS}"
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
BREAKS_IF_PEDANTIC= yes
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index e28969ac9ac4..1c04a63294c0 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -17,8 +17,8 @@ COMMENT= A preprocessor for making GTK+ objects with inline C
USE_GMAKE= yes
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
MAN1= gob.1
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index f4fae95c4e49..ed58034df416 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -23,9 +23,9 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
--with-xinput=xfree
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- X_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= X_CFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index a78a7746c30c..49f1161c06b9 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -46,9 +46,9 @@ USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
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
MAN1= gtk-query-immodules-2.0.1
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 81efc6d8facc..1ac127d69459 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -46,10 +46,10 @@ USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-static --enable-xinput=yes
CONFIGURE_ARGS+=--enable-gtk2-dependency
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
- -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
+CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
+CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \
+ -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gtk.Settings.FileChooser.gschema.xml
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index d620669cec87..f8bb75b9f585 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool
USE_GL= yes
USE_GNOME= gtk12 lthack
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}
CONFIGURE_ARGS= --with-lib-GL
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 61d1c310d1dd..df7a91d861ff 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -23,12 +23,11 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
USE_GNOME= gnomehack gtk20 libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= mathmlviewer.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 974cc2589fba..f23528b3bcdc 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -34,8 +34,8 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gtk20 ltverhack:1
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-documentation \
--enable-static=yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 622d62abbfb4..9faf1e21d642 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gtk30 ltverhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation \
--enable-static=yes
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 67f1d87b0e06..a2af7d0d3883 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -27,8 +27,8 @@ USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
ltverhack referencehack
CONFIGURE_ARGS= --enable-compile-warnings=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index d47a8623407c..ed09a63c96a5 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -29,8 +29,8 @@ USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack gtk20 gconf2 libxml2 intlhack \
ltverhack referencehack
CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no
-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/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index e5a8be070dfd..b6fd4f345015 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -21,7 +21,8 @@ USE_GETTEXT= yes
USE_GNOME= gtk20 ltverhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= DBUS "D-Bus backend" on
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 1366207e5fb9..4b088ea1964a 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -22,8 +22,8 @@ USE_GNOME= ltverhack gdkpixbuf libglade
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-gtkgl=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
INFO= guile-gtk
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index a0f3624155c1..efe7c69cdfd9 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \
libgnomecanvas libgnome referencehack
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 4f9ff1efd012..9b048e9a8cbd 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -21,8 +21,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomepanel libgnomeui atspi
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= lib/gtk-2.0/modules/libgail-gnome.la \
lib/gtk-2.0/modules/libgail-gnome.so \
libdata/pkgconfig/libgail-gnome.pc
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index 33e415f14239..eddc8a734fe6 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -23,8 +23,8 @@ USE_GNOME= gnomehack glib20
USE_GMAKE= yes
USE_XLIB= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= lib/libgdiplus.a \
lib/libgdiplus.la \
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index e7d62397671c..1d4cc642ae01 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -27,8 +27,8 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_BISON= build
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 97d65ff4077f..a6f81b78330b 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_BISON= build
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index 11ac36eeb5d2..19c9e4ee4d04 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -29,7 +29,7 @@ USE_GNOME= gnomehack gtk20
CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} \
--without-javadocs # needs docbook-utils
NOPORTDOCS= yes # needs docbook-utils and some parts are broken.
-CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd"
+CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
GTK_API_VERSION= 2.10
CAIRO_API_VERSION= 1.0
PLIST_SUB= GTK_API_VERSION=${GTK_API_VERSION} PORTNAME=${PORTNAME}
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 6159afcb1723..365284d09ba8 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -24,8 +24,8 @@ USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
CFLAGS+= -fPIC
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
pre-configure:
.for file in install-sh mkinstalldirs
diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile
index e2b74c3fe102..dde385d35389 100644
--- a/x11-toolkits/libgtksourceviewmm/Makefile
+++ b/x11-toolkits/libgtksourceviewmm/Makefile
@@ -21,8 +21,8 @@ USE_BZIP2= yes
USE_GNOME= gtksourceview2 gnomeprefix gnomehack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBAS}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBAS}/lib
CONFIGURE_ARGS= --disable-docs
.include <bsd.port.mk>
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 7c653ff7d975..7f56c986d44e 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -32,8 +32,8 @@ USE_BISON= build
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/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/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 453b85a07329..1250ed0ac10d 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -22,8 +22,8 @@ USE_BISON= build
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack gtk20 libartlgpl2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
post-patch:
@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index 03ed677a7e31..975b67291548 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -19,13 +19,13 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_SDL= sdl
USE_GL= gl
USE_GMAKE= yes
-MAKE_ENV= OPT="${OPT}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV= OPT="${OPT}"
USE_LDCONFIG= yes
OPT= ${CFLAGS} -fPIC -DPIC -Iinclude \
`${SDL_CONFIG} --cflags` `freetype-config --cflags` \
-I${LOCALBASE}/include
-LDFLAGS= `${SDL_CONFIG} --libs` `freetype-config --libs` \
+LDFLAGS+= `${SDL_CONFIG} --libs` `freetype-config --libs` \
-L${LOCALBASE}/lib
post-patch:
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index bb0f0a71025e..0c4efb8c9fb1 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
-CONFIGURE_ENV+= CFLAGS="-O0"
+CFLAGS+= -O0
.endif
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 5b801e8d57cc..b00fae488cf3 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -17,8 +17,8 @@ COMMENT= Athena Widgets with N*XTSTEP appearance
USE_AUTOTOOLS= libtool
USE_XORG= xmu x11 xext
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/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 9eb3cdee900d..51750f5ef7e9 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GL= glu
USE_QT_VER= 4
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
OPTIONS= GNUTLS "Build with GnuTLS support" off \
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 83ffa5822493..fb7cb976d447 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -29,7 +29,7 @@ USE_XORG= xaw xbitmaps xft
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_ENV= LANG=C
-CPPFLAGS= -DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+CPPFLAGS+= -DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
USE_CSTD= gnu89
DEMOS_SRC= ${WRKSRC}/demos/programs
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 34d473dc22a5..0b64451b5676 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -24,8 +24,8 @@ USE_LDCONFIG= yes
PLIST_FILES= include/gadget_lib.h include/otk_lib.h \
lib/libotk.so lib/libotk.so.0
-CPPFLAGS= -I${LOCALBASE}/include -fPIC
-LDFLAGS= -lGLU -lGL -lXmu -lXext -lX11 -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -fPIC
+LDFLAGS+= -lGLU -lGL -lXmu -lXext -lX11 -L${LOCALBASE}/lib
do-build:
cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -shared otk_lib.c \
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index c337ef3f7159..cfc0786d7d1d 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -50,15 +50,15 @@ MAN1= pango-view.1 pango-querymodules.1
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --with-x=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
- ${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \
+ ${GLIB2_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= X11="@comment "
.else
USE_XORG+= xft xrender
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
- ${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \
+ ${GLIB2_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= X11=""
.endif
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index dc8561044cef..fbba2a59270d 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -28,8 +28,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pango
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation \
--enable-static=yes
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index f6b3aea171d9..a9a9b387f368 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk-doc \
--with-html-dir=${PREFIX}/share/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/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 24ec0678876f..79f96bfaed47 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -26,8 +26,8 @@ CONFLICTS= paragui-[0-9]*
USE_AUTOTOOLS= libtool
USE_SDL= sdl image ttf
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_LDCONFIG= yes
SHLIB_VER= 4
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index b48e60889c8f..160dc01824c7 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -23,8 +23,8 @@ CONFLICTS= paragui-devel-[0-9]*
USE_AUTOTOOLS= libtool
USE_SDL= sdl image ttf
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_LDCONFIG= yes
SHLIB_VER= 4
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index ca8870a37c4d..69ff3d8a6f77 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -18,11 +18,10 @@ USE_XORG= xt xi xmu xext x11
USE_GL= glu
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CXXFLAGS+= -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/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 1dd58024bc19..29a8ff2d6ffa 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -36,8 +36,8 @@ USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \
evolutiondataserver
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-metacity --disable-nautilusburn
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gnome
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 46bb03c94c71..f179aae820cb 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gnomehack libgtkhtml pygnome2 libgda4
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-gdl
EG_SRC_DIR= ${WRKSRC}/examples
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index bb18d0888371..22ffd9d3199b 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -30,9 +30,9 @@ USE_LDCONFIG= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack libgnomeui pygtk2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gnome
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index b50e25a52a65..53d07082d7a4 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -28,11 +28,11 @@ USE_GNOME= gnomehack libglade2 pygobject
USE_PYTHON= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-lintl" \
+CONFIGURE_ENV= LIBS="-lintl" \
PYTHON="${PYTHON_VERSION}"
-CONFIGURE_ARGS= --disable-docs
+CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS= --disable-docs
DOCSDIR= ${PREFIX}/share/doc/py-gtk
EG_SRC_DIR= ${WRKSRC}/examples
@@ -59,12 +59,9 @@ CONFIGURE_ARGS+=--disable-numpy
.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --enable-thread
CFLAGS+= ${PTHREAD_CFLAGS}
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.else
CONFIGURE_ARGS+= --disable-thread
-.if defined(LDFLAGS)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-.endif
.endif
post-install:
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 035e1963c4c0..1a8f8a8b5269 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -21,9 +21,8 @@ USE_XZ= yes
USE_GNOME= gnomehack gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 6739dc931c71..313e62cb0cdb 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -27,9 +27,7 @@ CPPFLAGS+= -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include
LDFLAGS+= -L${QT_LIBDIR} -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= QTDIR="${QT_PREFIX}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
CONFIGURE_ARGS= --with-pthread=yes --with-coin=${LOCALBASE} \
--with-qt=${QT_LIBDIR}
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index edc8b79cf081..2ee4ebcbf494 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -22,8 +22,7 @@ USE_XORG= x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
--with-tclinclude=${TCL_INCLUDEDIR} --with-tkinclude=${TK_INCLUDEDIR} --enable-shared
-CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
TKPKG= ${PORTNAME}${PORTVERSION}
PLIST_SUB= TKPKG=${TKPKG}
USE_LDCONFIG= ${PREFIX}/lib/${TKPKG}
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index c0997603ccfd..b9d6c08a18e2 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -20,8 +20,7 @@ USE_XORG= x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
--with-tkinclude=${TK_INCLUDEDIR} --enable-shared
-CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
TKPKG= ${PORTNAME}${PORTVERSION}
PLIST_SUB= TKPKG=${TKPKG}
USE_LDCONFIG= ${PREFIX}/lib/${TKPKG}
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index 5f5f1c57b3f8..82e2cd812e88 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
--with-tk=${TK_LIBDIR} \
--exec-prefix=${PREFIX} --enable-shared
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
+CPPFLAGS+= ${TCL_INCLUDES} ${TK_INCLUDES}
TCL_INCLUDES= -I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic
TK_INCLUDES= -I${TK_INCLUDEDIR} -I${TK_INCLUDEDIR}/generic \
-I${TK_INCLUDEDIR}/unix
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index ae8da4b22d51..09512a49b84d 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 gnomeprefix ltverhack:2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-maintainer-flags
-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|g' \
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 8117cf190c54..38ce5c96c3e5 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -18,14 +18,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= gnomehack gtk20
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
USE_LDCONFIG= yes
MAN1= vdk-config-2.1
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 7f6e56e7a6fd..6f9a1d3c7679 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -21,14 +21,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= gtk20
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no
USE_LDCONFIG= yes
MAN1= vdkb2.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 7828f9e4a084..3b1da46b071a 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -26,8 +26,8 @@ USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GETTEXT= yes
USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS?=--disable-python \
--disable-Bsymbolic \
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 7e33091651a5..571d7e23c828 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -35,12 +35,12 @@ CONFIGURE_ARGS= --with-libpng=sys \
--with-opengl\
--enable-gtk2 \
--includedir=${PREFIX}/include/wx-2.4
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \
- -I${LOCALBASE}/include \
- ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv \
- ${PTHREAD_LIBS}"\
- X11BASE="${LOCALBASE}"
+CONFIGURE_ENV= X11BASE="${LOCALBASE}"
+CPPFLAGS+= -I${WRKSRC}/include \
+ -I${LOCALBASE}/include \
+ ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -liconv \
+ ${PTHREAD_LIBS}
NO_LATEST_LINK= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index fdf6ed97a8be..f5eee7e03819 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -38,11 +38,11 @@ CONFIGURE_ARGS= --with-libpng=sys\
--with-mspack\
--with-gtk\
--disable-backtrace
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -liconv" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"\
X11BASE="${LOCALBASE}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
NO_LATEST_LINK= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index f1334a420d07..09c87ab6fcd8 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -39,11 +39,11 @@ CONFIGURE_ARGS= --with-libpng=sys\
--enable-mediactrl\
--disable-backtrace\
--enable-graphics_ctx
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
PTHREAD_LIBS="${PTHREAD_LIBS}"\
X11BASE="${LOCALBASE}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
PLIST= ${.CURDIR}/pkg-plist
WXGTK_FLAVOR?= gtk2
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index fa0065fedee6..23bab5581de3 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -40,10 +40,10 @@ CONFIGURE_ARGS= --with-libpng=sys\
--enable-mediactrl\
--disable-backtrace\
--enable-graphics_ctx
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
PTHREAD_LIBS="${PTHREAD_LIBS}"\
X11BASE="${LOCALBASE}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
NO_LATEST_LINK= yes
OPTIONS= GSTREAMER "media support" on\
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index b82e53ca6857..ebfee7bc027a 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -25,7 +25,6 @@ USE_GL= gl
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
MAN1= fdesign.1 fd2ps.1
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 25214023bf8e..5f40f9d789a6 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -32,7 +32,6 @@ USE_GNOME= glib20 gtk20 pango
USE_ICONV= yes
USE_XORG+= ice sm x11 xcursor xext xfixes xi xinerama xrandr xrender
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--disable-ascp \
--enable-i18n \
--disable-send-postcard-to-developer \
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index ed76300f77c8..a196f13b90c6 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -19,9 +19,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= gtk12 libxml
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 1f457627a648..98b740233268 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox
USE_PERL5_BUILD= yes
USE_XORG= x11 xext
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags xft`" \
- LDFLAGS="`pkg-config --libs xft`"
+CPPFLAGS+= `pkg-config --cflags xft`
+LDFLAGS+= `pkg-config --libs xft`
MAN1= bbkeys.1
MAN5= bbkeysrc.5
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index c4441d8146be..060b52e29ebc 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -19,8 +19,8 @@ BUILD_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox
USE_GNOME= gnomehack pkgconfig
USE_XORG= xext sm x11 xau xcursor xi
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags xft`" \
- LDFLAGS="`pkg-config --libs xft`"
+CPPFLAGS+= `pkg-config --cflags xft`
+LDFLAGS+= `pkg-config --libs xft`
DOCS= AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
README TODO
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index b9390dc6d045..4e964a288c3b 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -58,8 +58,8 @@ GCONF_SCHEMAS= compiz-3d.schemas \
compiz-wallpaper.schemas \
compiz-widget.schemas
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-schemas
post-patch:
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index a0a432088b1a..928614402fbe 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -56,8 +56,8 @@ GCONF_SCHEMAS= compiz-animation.schemas \
compiz-vpswitch.schemas \
compiz-shift.schemas
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-schemas
.include <bsd.port.mk>
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index c8828ec7518e..7d97bb8949c7 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -39,8 +39,8 @@ GCONF_SCHEMAS= compiz-atlantis.schemas \
compiz-snow.schemas \
compiz-tile.schemas
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-schemas
.include <bsd.port.mk>
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 6bcd369edb33..9b5c1e31faf8 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -67,7 +67,7 @@ GCONF_SCHEMAS= gwd.schemas \
compiz-zoom.schemas
CONFIGURE_ARGS= --disable-kde4
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
OPTIONS= RSVG "Enable librsvg2 support" on \
GTK "Enable gtk2 support" on \
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 07787b58da58..7ae7b80a0d81 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -18,8 +18,8 @@ USE_GNOME= libwnck
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= devilspie.1
PORTDOCS= AUTHORS NEWS README TODO
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index ed74234dff72..abe068ec7076 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= x11
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
pre-configure:
@cd ${WRKSRC}; ${ACLOCAL}
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 2b4ff8849139..ee3c8aae1c46 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -31,8 +31,8 @@ USE_AUTOTOOLS= libtool
MAN1= emerald.1 \
emerald-theme-manager.1
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
# XXX - might want to change that
post-patch:
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index b93a7e67e6cc..2f7fac95cf85 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -25,8 +25,8 @@ USE_GL= glut
USE_GMAKE= yes
USE_AUTOTOOLS= libtool autoconf
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-auto-respawn
.include <bsd.port.pre.mk>
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 4a055280a95b..a749ca21ddd8 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -82,13 +82,13 @@ CONFIGURE_ARGS+= --enable-xinerama
.if !defined(WITHOUT_NLS)
USE_ICONV= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS:=""
.else
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS:="@comment "
.endif
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 692577f21ac0..2f98b694cb34 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -19,7 +19,8 @@ USE_XORG= x11 ice xinerama xext xrandr sm
USE_GNOME= gtk20 # gdkpixbuf really :-)
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-shaped-decorations \
--enable-guievents \
--with-cfgdir=${DATADIR} \
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 64ff6967ba47..597c492eb611 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -21,8 +21,8 @@ USE_XORG= xpm
GNU_CONFIGURE= yes
USE_BZIP2= yes
CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= jwm.1
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index fac64a508363..be30298106d0 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -24,8 +24,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack intltool libxml2
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
echo ${OSVERSION}
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index cb9e088ec88e..271704523321 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -30,8 +30,8 @@ USE_XORG= xpm xft
USE_PERL5= 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
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-nlsdir=${PREFIX}/share/locale \
--with-libs-from="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index a4165656df5c..e1d07fa4f7e2 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -22,7 +22,7 @@ PORTDOCS= AUTHORS BUGS ChangeLog README TODO
PLIST_FILES= bin/${PORTNAME}
CFLAGS+= `pkg-config --cflags sm x11 xext` -DSHAPE
-LDFLAGS= `pkg-config --libs sm x11 xext`
+LDFLAGS+= `pkg-config --libs sm x11 xext`
post-patch:
@${LN} -sf ${PORTNAME}.man ${WRKSRC}/${PORTNAME}.1
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index 62010979a789..050e0cec0e30 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -29,7 +29,6 @@ MAN1= lxsession.1 lxsession-logout.1
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/matchbox/Makefile b/x11-wm/matchbox/Makefile
index 38a1f89dd0f3..4ae1129bc08f 100644
--- a/x11-wm/matchbox/Makefile
+++ b/x11-wm/matchbox/Makefile
@@ -19,8 +19,8 @@ LICENSE= GPLv2
USE_BZIP2= yes
USE_XORG= xfixes xcursor xext
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/matchbox-window-manager bin/matchbox-remote \
etc/matchbox/kbdconfig
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 8cab1fee8da2..ca7bf437364c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -27,8 +27,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= metacity.schemas
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index d69c635f9672..8d26c9befa28 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -29,8 +29,8 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= mutter.schemas
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index e028aa30c034..c5f41bcf29e9 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
USE_GNOME= gnomehier libglade2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
- OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
+CONFIGURE_ENV= OPENBOX_CFLAGS="`pkg-config --cflags obrender-3.5 obt-3.5`" \
OPENBOX_LIBS="`pkg-config --libs obrender-3.5 obt-3.5`"
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/openbox
MAKE_ARGS= mkdir_p='${MKDIR}'
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= ABOUT-NLS AUTHORS README TODO
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 4e77aa2b6033..591878c25cb0 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
--enable-image-png --disable-debug \
--disable-pedantic
CFLAGS+= -DICONV_CONST -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
MAN1= pekwm.1
MANCOMPRESSED= no
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index b7f2399b431a..80e618754953 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -17,7 +17,7 @@ COMMENT= A window manager that emphasizes efficiency, speed, and beauty
USE_GMAKE= yes
USE_EFL= imlib2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lm"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -lm
.include <bsd.port.mk>
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 1f1fcf584f3c..761e780a1f01 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -27,7 +27,6 @@ USE_GNOME= gnomehack gtk20
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \
--datadir=${PREFIX}/share
INSTALLS_ICONS= yes
@@ -36,8 +35,8 @@ MANCOMPRESSED= yes
MAN1= sawfish.1 sawfish-client.1 sawfish-config.1
INFO= sawfish
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 7cea4a9eade6..b082ba1955b1 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -26,8 +26,8 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= PNG "Enable PNG support" On \
SVG "Enable SVG support" On \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index c80ee6170692..cb58b8578a40 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -31,8 +31,8 @@ USE_XORG= xpm xft
USE_PERL5= 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
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-nlsdir=${PREFIX}/share/locale \
--with-libs-from="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa
index 81056832f586..6dfbf13c58ae 100644
--- a/x11-wm/wmanager/files/patch-aa
+++ b/x11-wm/wmanager/files/patch-aa
@@ -36,7 +36,7 @@ diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile
-LDDIRS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
-
+LD = $(CXX)
-+LDFLAGS ?= -lGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS}
++LDFLAGS += -lGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS}
+LDDIRS = -L$(x11lib)
# install settings
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index b7b9b52d3e62..20759a43e55b 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -21,8 +21,8 @@ USE_XORG= x11 xpm
USE_GETTEXT= yes
USE_GNOME= gdkpixbuf
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \
--with-data-dir=${PREFIX}/share/xfce \
--with-locale-dir=${PREFIX}/share/locale \
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index ddff903e262b..e7c2976ea1bc 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -17,7 +17,6 @@ COMMENT= 3D Virtual Desktop Switcher
USE_GL= glut
USE_EFL= imlib2
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= 3ddesk.1 3ddeskd.1
PORTDOCS= README README.windowmanagers
@@ -25,8 +24,8 @@ PLIST_FILES= bin/3ddesk bin/3ddeskd etc/3ddesktop.conf \
%%DATADIR%%/digits.bmp
PLIST_DIRS= %%DATADIR%%
-CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 0fff26346ae8..6dcb0bbd7f97 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -17,7 +17,8 @@ COMMENT= Dock any application with no native tray icon
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= alltray.1
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index d0f43e29b514..8f4dbcbd49cd 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -23,7 +23,8 @@ CONFIGURE_ARGS= --enable-wtmp \
--disable-thai \
--without-afterstep-config
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= TRANS "Transparency support" on \
BSDEL "BSD-style backspace and delete" on \
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 90168af06ab7..440ba98aca2c 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_XORG= x11 xproto xcomposite xrender
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAKE_JOBS_SAFE= yes
AWN_DESKTOP?= agnostic
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index efe718c31647..30fef53bf759 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -19,7 +19,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun
USE_XORG= xpm
USE_GNOME= gtk20
USE_GMAKE= yes
-MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PORTDOCS= README
PLIST_FILES= bin/bbrun
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index 63dd7390882d..d980bf83436a 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack libwnck libgnomeui
CONFIGURE_ARGS= --enable-tray-icon
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= brightside.schemas
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index b2608282c42e..2adffaa0832d 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GL= gl
USE_EFL= imlib2
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
do-build:
cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 027b9c2fdbce..31b464868f85 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ARGS?=--enable-trans --enable-utmp \
--enable-xim --with-theme-update \
--with-backspace=bs --without-terminfo \
--enable-multi-charset
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS= MMX "With MMX instruction set" off
USE_XORG= x11 xt
USE_ICONV= yes
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index bf48e7f1d641..e9c9fb376993 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GL= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/GL" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/GL
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \
--with-confdir=${LOCALBASE}/share/xscreensaver/config
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index dbcdc03cf242..f7a9a3437e31 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -31,6 +31,5 @@ GCONF_SCHEMAS= florence.schemas
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 27ae7bd199f7..6aa6ebdd62f3 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -20,8 +20,8 @@ USE_AUTOTOOLS= libtool
USE_GNOME= gtk12
USE_ICONV= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \
- CFLAGS="${CFLAGS} `pkg-config xft --cflags`"
+LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex -liconv
+CFLAGS+= `pkg-config xft --cflags`
CONFIGURE_ARGS= --sbindir=${PREFIX}/bin \
--without-gnome
USE_LDCONFIG= yes
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d0d989df3847..1a62853c707c 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -46,10 +46,10 @@ GCONF_SCHEMAS= gdm-simple-greeter.schemas
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \
--with-at-spi-registryd-directory=${LOCALBASE}/libexec
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-lm" \
+CONFIGURE_ENV= LIBS="-lm" \
GTKDOC="false"
+CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES+= gdm.pam
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 6953e0a58de1..b8cd868db8a4 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ggi-prefix=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
SUB_FILES= pkg-message
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 386dab30f94a..ed25ab252486 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -20,8 +20,8 @@ USE_GNOME= gtk20
USE_GMAKE= 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-stlport
PORTDOCS= README
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 0b692899a299..17d90546f04b 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -39,9 +39,9 @@ USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mixer-applet \
--disable-networkmanager
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- OS_SYS="/usr/include"
+CONFIGURE_ENV= OS_SYS="/usr/include"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
mixer.schemas multiload.schemas stickynotes.schemas
@@ -61,7 +61,7 @@ LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify
.endif
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+= -fPIC
PLIST_SUB= BATTERY="@comment "
.else
GCONF_SCHEMAS+= battstat.schemas
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 5a358b67d2bc..1762fcc7e830 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -34,8 +34,8 @@ INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gnome-about.1
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index c36b73969a08..54a668122b03 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -28,8 +28,8 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-test-gnome
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \
gnome-doc.1 gnome-dump-metadata.1 gnome-gen-mimedb.1 \
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 40a2dd77bad8..421bd0f3cf53 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -25,8 +25,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
USE_AUTOTOOLS= libtool
USE_PYTHON= yes
USE_LDCONFIG= 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|applications.menu||' \
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 4887b4cf240d..bc2d84c50678 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -36,8 +36,8 @@ WANT_GNOME= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-network-manager
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
MAN1= gnome-panel.1
GCONF_SCHEMAS= clock.schemas fish.schemas \
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 55cb5c7ea4a1..e23121595bd5 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -31,8 +31,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-screensaver.schemas
MAN1= gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 6a6783ab652c..73a300af4c01 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -37,8 +37,8 @@ GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docbook-docs
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
gnome-session-save.1
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 6328c31a7fbe..6387ac9ec82b 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -34,7 +34,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \
gnomedesktop ltverhack libgnomeui librsvg2
USE_GSTREAMER= theora
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr"
+CPPFLAGS+= -I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr
GCONF_SCHEMAS= gnome-shell.schemas
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index 0d4896a2083b..1fcc595ae40c 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -18,9 +18,9 @@ USE_XORG= x11
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomepanel libgnomeui
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 7cde07c31a2c..0bd93b725e06 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -25,8 +25,8 @@ USE_XORG= sm
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \
libgnome
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= gnome-terminal.schemas
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 1bf04512fcc8..ecaacf1b750d 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -23,8 +23,8 @@ USE_GMAKE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gsynaptics.1 gsynaptics-init.1
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index f20ea44a5a08..9821c0e14e41 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -17,7 +17,6 @@ COMMENT= A simple GTK-2 terminal with tabs
USE_GNOME= vte
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
PORTDOCS= README
PLIST_FILES= bin/gtkterm2 \
@@ -25,8 +24,8 @@ PLIST_FILES= bin/gtkterm2 \
%%DATADIR%%/pixmaps/gtkterm2.png
PLIST_DIRS= %%DATADIR%%/pixmaps %%DATADIR%%
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|^CFLAGS=""||g' ${WRKSRC}/configure
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index b80251e08886..a6d5ee07d85c 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -20,8 +20,8 @@ USE_XORG= x11 xmu ice xaw
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/DND/DNDlib
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/" \
- LDFLAGS="-L${LOCALBASE}/lib/"
+CPPFLAGS+= -I${LOCALBASE}/include/
+LDFLAGS+= -L${LOCALBASE}/lib/
MAKE_JOBS_UNSAFE= yes
post-install:
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 49eb62579a22..25b44eef3867 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -24,13 +24,11 @@ USE_FAM= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index ba0cebb46594..07c4f50bba55 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -28,9 +28,9 @@ JAVA_VERSION= 1.5+
JAVA_OS= native
USE_GNOME= gnomehack libgnomeui
CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}
-CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" \
- ac_cv_path_DB1="nocommand" \
+CONFIGURE_ENV= ac_cv_path_DB1="nocommand" \
ac_cv_path_DB2="nocommand"
+CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
MAKE_JOBS_UNSAFE= yes
# jikes related
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 82dcda4dc4ba..12c4878055f5 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -32,8 +32,8 @@ USE_BISON= build
USE_XORG= xpm
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= pkg-deinstall
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index c4d0030d9caf..9aac3868fb29 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -24,8 +24,8 @@ INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index c28b8dec67fd..3e6ccb13b6f6 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -20,8 +20,8 @@ USE_LDCONFIG= yes
USE_XORG= x11
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/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/g' \
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 472800596b95..d756764b5729 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -32,8 +32,7 @@ CONFIGURE_ARGS= --disable-doxygen \
--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
--disable-gtk-doc \
--with-html-dir=${GNOME_HTML_DIR}
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index a3248758d546..04054bdb4b42 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -21,6 +21,5 @@ USE_GMAKE= yes
USE_FAM= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.include <bsd.port.mk>
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 7672c72f3ef5..bb58dc9215fb 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
.include <bsd.port.pre.mk>
.if (${ARCH} == "alpha")
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -lio"
+LDFLAGS+= -lio
.endif
.if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 091d87365b1f..bb3d8524a382 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -25,7 +25,8 @@ CONFIGURE_ARGS= --with-imagelib=gdk-pixbuf2 --enable-utmp \
--mandir="${LOCALBASE}/man" --enable-optimize-redrawing \
--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader" \
--disable-iiimf
-CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
+CFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
OPTIONS= FRIBIDI "Use Fribidi for BiDi rendering" off \
UIM "uim support (experimental)" off \
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index c130458cedbc..29e819775fe7 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -38,8 +38,8 @@ LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
CONFIGURE_ARGS+= --enable-xft
.endif
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LIBS="${LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
.if !defined(NOPORTDOCS)
PORTDOCS= TIPS \
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 8821d4fdf600..64f23c5b6f89 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -19,8 +19,8 @@ INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix libglade
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= mgt-helper.1 multi-gnome-terminal.1
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 501f118f92d9..0a983d9bcf38 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -16,13 +16,12 @@ COMMENT= Turns on numlock in X
USE_XORG= x11 xext xtst
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
PLIST_FILES= bin/numlockx
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index d99b4a2c514f..cbaad3d02c2c 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -16,8 +16,8 @@ COMMENT= A terminal emulator for the X11
USE_GNOME= gnomelibs gnomehier
USE_AUTOTOOLS= autoconf
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${IMLIB_CONFIG} --cflags`" \
- LDFLAGS="-L${LOCALBASE}/lib `${IMLIB_CONFIG} --libs`"
+CPPFLAGS+= -I${LOCALBASE}/include `${IMLIB_CONFIG} --cflags`
+LDFLAGS+= -L${LOCALBASE}/lib `${IMLIB_CONFIG} --libs`
ALL_TARGET= ${PORTNAME}
.include <bsd.port.mk>
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 66027e74f093..7a702b39390a 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
USE_GNOME= pkgconfig
USE_XORG= xpm xft xrender
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LIBS="-lutil"
CONFIGURE_ARGS= --enable-everything --with-term=rxvt \
--with-terminfo=${LOCALBASE}/share/misc/terminfo.db
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 8628bc3ba899..dad85ffdf93a 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -19,8 +19,8 @@ USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xv-path=${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/sisctrl
MAN1= sisctrl.1x
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index f3c5b93cb4b6..0e40070f24f1 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig ltasneededhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=ac_cv_lib_ICE_IceConnectionNumber=no
.include <bsd.port.mk>
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index 849813130204..437646399538 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -16,8 +16,8 @@ COMMENT= A very fast launcher program for X
USE_XORG= x11 xproto
MAKE_JOBS_SAFE= yes
-CPPFLAGS= -I${LOCALBASE}/include -lX11
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -lX11
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/thinglaunch
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 96a757a35617..a18d2b2296b8 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -29,8 +29,7 @@ NOT_FOR_ARCHS= sparc64
USE_XORG= x11 xmu
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}"
+CONFIGURE_ENV= DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}"
CONFIGURE_ARGS= --with-logdir=/var/log \
--with-runlockdir=/var/run \
--with-wdmdir=${WDMDIR} \
@@ -45,8 +44,8 @@ CONFIGURE_ARGS= --with-logdir=/var/log \
MAN1= wdm.1 wdmLogin.1
-CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
-LDFLAGS= -L${LOCALBASE}/lib -lintl
+CPPFLAGS+= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
+LDFLAGS+= -L${LOCALBASE}/lib -lintl
DEF_SERVER?= ${LOCALBASE}/bin/X
XRDB_PATH?= ${LOCALBASE}/bin/xrdb
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index a5d3f1a985f5..8e3392be8cff 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -18,9 +18,7 @@ COMMENT= An application launcher dockapp similar to wmbutton
GNU_CONFIGURE= yes
USE_XORG= xpm x11 xext sm ice
-MAKE_ENV= DATADIR="${DATADIR}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+MAKE_ENV= DATADIR="${DATADIR}"
MAN1= wmappl.1
MAN5= wmapplrc.5
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 7a2f57a527a8..88309bb5c81c 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -31,8 +31,8 @@ MAKE_JOBS_SAFE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool
USE_GSTREAMER= good
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="`pkg-config --libs libgnomeui-2.0`"
+CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-gconf --disable-pulse
.include <bsd.port.pre.mk>
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 41be01623681..e6f477153477 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \
--enable-next-scrollbar --enable-utmp --enable-wtmp \
--enable-menubar --enable-graphics --with-term=xterm-color \
--with-xpm-includes=${LOCALBASE} --with-xpm-library=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs"
+CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs
MAN1= wterm.1
PLIST_FILES= bin/wterm
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 21ce12c4cdbc..aa8d03eadda3 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -23,9 +23,9 @@ USE_ICONV= yes
USE_XORG= ice sm x11 xaw xext xmu xt
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-pr3287 --with-fontdir=local --disable-dbcs
-CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" \
- LDFLAGS="-L${PREFIX}/lib" \
- LIBS="-L${PREFIX}/lib"
+CONFIGURE_ENV= LIBS="-L${PREFIX}/lib"
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
.if defined(WITHOUT_OPENSSL)
CONFIGURE_ARGS+= --disable-ssl
.else
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index b07012a81424..685a0ce830e6 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_XORG= xtst
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/pat2ppm bin/patextract bin/png2pat bin/rgb2pat \
bin/visgrep bin/xmousepos bin/xte
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 6c28f7d69b64..232f1bedcffb 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -19,8 +19,8 @@ OPTIONS= GUILE "Guile support" off \
USE_XORG= x11 xi
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAN1= xbindkeys.1
PLIST_FILES= bin/xbindkeys %%EXAMPLESDIR%%/xbindkeysrc
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 44904d51a333..4d85cac59d31 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -20,12 +20,11 @@ COMMENT= A drop in replacement for the "dialog" or "cdialog" programs
USE_BZIP2= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= Xdialog.1
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 3579aeb05b51..f352fd6d2f94 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --with-xkb-base=${LOCALBASE}/lib/X11/xkb
-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/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index bc18185b84ca..b40a0c247b55 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \
--with-xkb-rules-symlink=xorg
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index b2d71e96a2a1..24478cd45ae5 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -32,8 +32,8 @@ PATCHREV= .2
USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
MAN1= xloadimage.1 uufilter.1
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 95f10b9cc077..e3d2e0c28111 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -24,8 +24,9 @@ USE_PYTHON= 2.5+
USE_GNOME= gnomehack
PORTDOCS= README COPYING INSTALL NEWS XcbPythonBinding.txt
-GNU_CONFIGURE=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-I${LOCALBASE}/lib"
+GNU_CONFIGURE= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 14cd6c293cda..b9f255461f15 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -20,9 +20,9 @@ USE_GNOME= pkgconfig
USE_NCURSES= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib \
- XLIBS="-L${LOCALBASE}/lib -lX11"
+CONFIGURE_ENV= XLIBS="-L${LOCALBASE}/lib -lX11"
+LDFLAGS+= -L${LOCALBASE}/lib
+CFLAGS+= -I${LOCALBASE}/include
MAN1= xrestop.1
PLIST_FILES= bin/xrestop
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 82d40c19d9f5..360dd0d4601a 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -34,9 +34,9 @@ CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
--with-configdir=${PREFIX}/share/xscreensaver/config \
--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
--with-xf86gamma-ext --with-randr-ext --enable-locking
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBS="-lintl"
+CONFIGURE_ENV= LIBS="-lintl"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS?= PAM "Pluggable Authentication Module support" on \
KEYRING "Enable GnomeKeyring integration (needs PAM)" on \
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index 3c40f9dc374e..c8390b0caf49 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp
PLIST_FILES= bin/XScreenSaver.App
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS= "LDFLAGS+=-L${LOCALBASE}/lib"
diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile
index d87a14c5ac7f..9ff2947b9cbe 100644
--- a/x11/xsel-conrad/Makefile
+++ b/x11/xsel-conrad/Makefile
@@ -18,7 +18,7 @@ COMMENT= Access X selection from command line
CONFLICTS= xsel-[0-9]*
USE_XORG= x11 xext xt xproto ice sm
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lXext -lX11
+LDFLAGS+= -L${LOCALBASE}/lib -lXext -lX11
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= ChangeLog README
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 428c3eb45c61..84f78e01ff55 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= xsel-conrad-[0-9]*
USE_BZIP2= yes
USE_XORG= xmu xaw xt xproto xkbfile
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -lXt -lXaw
+LDFLAGS+= -L${LOCALBASE}/lib -lXt -lXaw
MAN1= ${PORTNAME}.1
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= ${PORTNAME}.html
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 849a0617600e..245e846add6d 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -20,15 +20,14 @@ LICENSE_COMB= dual
USE_BISON= build
USE_XORG= xft x11 xext xi xtst
USE_IMAKE= yes
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
MAN1= xstroke.1
PLIST_FILES= bin/xstroke %%ETCDIR%%/alphabet
PLIST_DIRS= %%ETCDIR%%
CFLAGS+= -I.
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index 05ad51d9bf57..6155fa1736a2 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm
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
PLIST_FILES= bin/xtermcontrol
MAN1= ${PORTNAME}.1
diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile
index 3524a282e979..0c423323ca80 100644
--- a/x11/xvmcinfo/Makefile
+++ b/x11/xvmcinfo/Makefile
@@ -15,7 +15,7 @@ COMMENT= Print out XvMC extension adaptor information
USE_XORG= xvmc xv x11
-LDFLAGS= -lXvMC -lXv -lX11
+LDFLAGS+= -lXvMC -lXv -lX11
NO_WRKSUBDIR= defined
PLIST_FILES= bin/xvmcinfo
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 5448f4b4dedf..7469b72505a8 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -20,6 +20,6 @@ USE_KDEBASE_VER=3
USE_GMAKE= yes
USE_GETTEXT= yes
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
+LDFLAGS+= ${PTHREAD_LIBS}
.include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index df720e976ec5..1cd19df9b729 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -30,8 +30,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gecko=${GECKO} \
--with-gecko-home=${LOCALBASE}/lib/${GECKO}
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 03ccc5ea658d..1705efbc3bea 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -25,8 +25,8 @@ USE_BZIP2= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
MAN1= zenity.1