diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
| commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
| tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /sysutils | |
| parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
| download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip | |
Notes
Diffstat (limited to 'sysutils')
124 files changed, 188 insertions, 219 deletions
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 |