diff options
Diffstat (limited to 'deskutils')
63 files changed, 120 insertions, 125 deletions
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 |