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 /devel | |
| parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
| download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip | |
Notes
Diffstat (limited to 'devel')
189 files changed, 347 insertions, 362 deletions
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile index a7c999e0bfcb..a55537f7f8d0 100644 --- a/devel/ORBit/Makefile +++ b/devel/ORBit/Makefile @@ -21,8 +21,8 @@ USE_GNOME= glib12 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-indent -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INFO= libIDL diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 4b883817f987..0c4ce73300c0 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool USE_GNOME= gnomehack libidl ltverhack referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile index 8f6c93ff7cdd..e2ab28e87eed 100644 --- a/devel/aegis/Makefile +++ b/devel/aegis/Makefile @@ -23,8 +23,8 @@ USE_TK= yes GNU_CONFIGURE= yes CPPFLAGS+= "-I${LOCALBASE}/include" CONFIGURE_ARGS= --with-nlsdir="${PREFIX}/share/locale" -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - WISH="${WISH}" +CONFIGURE_ENV= WISH="${WISH}" +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes # XXX Manpages are installed into ${DATADIR} too -- there's no easy way to diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index 6e95b1704121..0e9adea71333 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -101,8 +101,8 @@ PLIST_SUB+= PROFILE="@comment " .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+=--enable-pthreads -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD" \ - LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD +LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+=--disable-pthreads .endif diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile index 750c587bec79..d7176d6d2b47 100644 --- a/devel/anjuta-extras/Makefile +++ b/devel/anjuta-extras/Makefile @@ -21,8 +21,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= intltool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-plugin-valgrind \ --localedir=${PREFIX}/share diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index e7f17c4b345f..936bc4f37a74 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -41,8 +41,8 @@ USE_PERL5= yes USE_PYTHON= yes USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-symbol-db-shm=/tmp \ --disable-vala \ --enable-introspection=no diff --git a/devel/avarice/Makefile b/devel/avarice/Makefile index 52cd049c0309..bc1c0bd96608 100644 --- a/devel/avarice/Makefile +++ b/devel/avarice/Makefile @@ -20,7 +20,8 @@ USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= avarice.1 ice-gdb.1 ice-insight.1 diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile index 9a8bf053fd6f..3adb18c30a74 100644 --- a/devel/avr-binutils/Makefile +++ b/devel/avr-binutils/Makefile @@ -23,8 +23,8 @@ USE_GMAKE= yes USE_GETTEXT= build CONFIGURE_ARGS= --target=avr GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include .if (${MACHINE_ARCH} == "amd64") MACHINE_ARCH= x86_64 .endif diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile index 3f280f311f00..716ef9b72a7d 100644 --- a/devel/avrdude/Makefile +++ b/devel/avrdude/Makefile @@ -18,7 +18,8 @@ MAN1= avrdude.1 MANCOMPRESSED= no GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes .include <bsd.port.pre.mk> diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile index 5b23b084591b..216921bf33e4 100644 --- a/devel/bennugd-modules/Makefile +++ b/devel/bennugd-modules/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png USE_SDL= sdl mixer GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd" MAKE_JOBS_SAFE= yes diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 18e79aac2f0d..f8c6e8b1f693 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -31,7 +31,7 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING3.LIB CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-system-zlib \ --disable-werror \ --with-gmp=${LOCALBASE} \ diff --git a/devel/bison/Makefile b/devel/bison/Makefile index afb7705eeef1..cb755db818d0 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= bison.1 INFO= bison diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 31bc6eb63dca..94814be04168 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -20,8 +20,8 @@ USE_GNOME= gnomeprefix gnomehack bonobo gconf USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index d9a73e12051b..e1b97f690acf 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -24,8 +24,8 @@ USE_GETTEXT= yes GNOME_HTML_DIR= ${PREFIX}/share/doc/bonobo USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index abffc2be8417..f5c9f41e10c7 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -27,8 +27,8 @@ GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack intlhack libbonobo \ gnomedocutils evolutiondataserver GNOME_DESKTOP_VERSION=2 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= bug-buddy.schemas diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile index 3ecf3b212081..aefb3a5dc794 100644 --- a/devel/ccrtp/Makefile +++ b/devel/ccrtp/Makefile @@ -20,8 +20,8 @@ USE_GMAKE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} INFO= ccrtp post-patch: diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile index d91961e41e73..4aa9a4b611b2 100644 --- a/devel/cgdb/Makefile +++ b/devel/cgdb/Makefile @@ -28,7 +28,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline RUN_DEPENDS= ${BUILD_DEPENDS} LDFLAGS+= -rpath ${LOCALBASE}/lib CONFIGURE_ARGS+= --with-readline=${LOCALBASE} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif post-patch: diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index e21526284af6..f454d3827c9a 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -27,10 +27,10 @@ USE_ICONV= yes USE_GMAKE= yes USE_OPENSSL= yes CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ - CGIT_SCRIPT_PATH=${WWWDIR} \ +MAKE_ENV+= CGIT_SCRIPT_PATH=${WWWDIR} \ CGIT_CONFIG=${PREFIX}/etc/cgitrc \ NEEDS_LIBICONV=yes +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index c30727e93f31..5eb20d44bf42 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -28,7 +28,6 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs USE_GMAKE= yes USE_XORG= x11 xmu xi diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile index d5e4a70a99f4..05bfa6089db0 100644 --- a/devel/commoncpp/Makefile +++ b/devel/commoncpp/Makefile @@ -19,12 +19,11 @@ USE_LDCONFIG= yes USE_GNOME= gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - ac_cv_path_DOXYGEN=no +CONFIGURE_ENV= ac_cv_path_DOXYGEN=no INFO= commoncpp2 -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/devel/cook/Makefile b/devel/cook/Makefile index 5a7c42ae02c2..c14e4f1422cc 100644 --- a/devel/cook/Makefile +++ b/devel/cook/Makefile @@ -17,8 +17,9 @@ MAINTAINER= jasone@FreeBSD.org COMMENT= Like make(1), but more powerful and clean GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \ - YACC=yacc +CONFIGURE_ENV= YACC=yacc +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes MAN1= c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \ diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index 230bbe347e03..156ef9f6f6a7 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_BZIP2= yes LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LDFLAGS="${LDFLAGS}" TINYXML=-ltinyxml +MAKE_ENV+= TINYXML=-ltinyxml PLIST_FILES= bin/cppcheck diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile index 7af6ffe1bf89..377fae4ef742 100644 --- a/devel/cppi/Makefile +++ b/devel/cppi/Makefile @@ -17,7 +17,7 @@ COMMENT= A tool to indent the C preprocessor directives USE_XZ= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include PLIST_FILES= bin/cppi MAN1= cppi.1 diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile index 9a3209132e63..c04d37db42b6 100644 --- a/devel/cutter/Makefile +++ b/devel/cutter/Makefile @@ -16,7 +16,7 @@ COMMENT= Unit Testing Framework for C and C++ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ pangocairo:${PORTSDIR}/x11-toolkits/pango -CPPFLAGS= "-I${LOCALBASE}/include" +CPPFLAGS+= "-I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc GNU_CONFIGURE= yes USE_GETTEXT= yes diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index 59a8524bd0f0..924bcebc4036 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -19,7 +19,6 @@ EXTRA_PATCHES= ${FILESDIR}/extra-cvsd-buildroot.in USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-libwrap MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile index 12355b1d8339..08660fec2851 100644 --- a/devel/cxxtools/Makefile +++ b/devel/cxxtools/Makefile @@ -18,8 +18,8 @@ PATCH_STRIP= -p1 USE_ICONV= yes USE_CSTD= gnu89 GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAKE_JOBS_SAFE= yes .include <bsd.port.pre.mk> diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile index c65db3e31253..ed10658cd01a 100644 --- a/devel/datadesigner/Makefile +++ b/devel/datadesigner/Makefile @@ -22,8 +22,8 @@ USE_ICONV= yes USE_WX= 2.4 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index 97cc7e0c7a65..7b9ecdf1967d 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -24,8 +24,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_SUB= VERSION="1.0" diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile index a446421227b8..908edff2b587 100644 --- a/devel/dbus-qt3/Makefile +++ b/devel/dbus-qt3/Makefile @@ -24,8 +24,9 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= QTDIR=${LOCALBASE} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_SUB= VERSION="1.0" diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile index 7e33bca24a53..2288a162face 100644 --- a/devel/dbus-sharp/Makefile +++ b/devel/dbus-sharp/Makefile @@ -35,9 +35,9 @@ CONFIGURE_ARGS= --enable-mono \ --with-session-socket-dir=/var/tmp \ --disable-doxygen-docs \ --disable-xml-docs -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include <bsd.port.mk> diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 5f9fc4536f32..37b2eec03931 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -28,9 +28,9 @@ CONFIGURE_ARGS=--localstatedir=/var \ --with-session-socket-dir=/var/tmp \ --disable-doxygen-docs \ --disable-xml-docs +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_RC_SUBR= dbus USE_GNOME_SUBR= yes diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 5bb584070867..b5245ec3acb2 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -29,8 +29,8 @@ GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib pre-build: ${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0 diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index c3a32beaa6e9..2d00adf98680 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -24,8 +24,6 @@ GNU_CONFIGURE= yes CFLAGS+= -Wno-deprecated CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \ --with-readline-libraries=/usr/lib diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index 5dc0726fdc2f..b18e8a7459b8 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -21,8 +21,9 @@ USE_GMAKE= yes WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-lispdir -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" EMACS="no" +CONFIGURE_ENV= EMACS="no" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= desktop-file-install.1 desktop-file-validate.1 \ update-desktop-database.1 diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index aa1772c43222..46e50d6f00e1 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -29,8 +29,8 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes GCONF_SCHEMAS= devhelp.schemas -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib OPTIONS= GEDIT "Enable GEdit plug-in support" off diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile index 891719164ac1..8b15ffd20d1c 100644 --- a/devel/dia2code/Makefile +++ b/devel/dia2code/Makefile @@ -17,8 +17,8 @@ COMMENT= A small utility used to generate code from a Dia diagram USE_GNOME= libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index 8049c36b286b..e5e5467cf42e 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -26,7 +26,8 @@ OPTIONS= FREETYPE2 "Enable Freetype support" on \ UNIQUE "Enable Unique (WM Module)" off \ TESTS "Install test apps" off -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index 0056ab317f41..04e523bc53ad 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -25,8 +25,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gprof --disable-Werror WANT_GNOME= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib DISTCCD_PIDFILE=/var/run/distccd.pid USE_RC_SUBR= distccd.sh SUB_LIST= DISTCCD_PIDFILE=${DISTCCD_PIDFILE} diff --git a/devel/dklibs/Makefile b/devel/dklibs/Makefile index 0d893edeae9b..3daabc19cab3 100644 --- a/devel/dklibs/Makefile +++ b/devel/dklibs/Makefile @@ -35,10 +35,8 @@ CONFIGURE_ARGS+= --datadir=${DATADIR} \ --datarootdir=${DATADIR} \ --sysconfdir=${ETCDIR} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" - # Need -lc for RELENG_6 support. -MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc" +LDFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} -lc .if !defined(NO_INSTALL_MANPAGES) MAN3= dk.3 \ diff --git a/devel/dprog/Makefile b/devel/dprog/Makefile index 4190a56e0790..19d8b0294e3e 100644 --- a/devel/dprog/Makefile +++ b/devel/dprog/Makefile @@ -18,8 +18,8 @@ COMMENT= A language for specifying dynamic programming algorithms LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= EMACS "Install emacs syntax files" on diff --git a/devel/dwarfdump/Makefile b/devel/dwarfdump/Makefile index f456e8d4f93e..039a307b7abb 100644 --- a/devel/dwarfdump/Makefile +++ b/devel/dwarfdump/Makefile @@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include MAN1= dwarfdump.1 diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile index a18e2f38aa5e..cb883bb58ee1 100644 --- a/devel/eggdbus/Makefile +++ b/devel/eggdbus/Makefile @@ -24,8 +24,8 @@ MAKE_JOBS_UNSAFE=yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --localstatedir=/var -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if defined(NO_INSTALL_MANPAGES) CONFIGURE_ARGS+=--disable-man-pages diff --git a/devel/fastdep/Makefile b/devel/fastdep/Makefile index 12afce3ee002..26fa3afc63ec 100644 --- a/devel/fastdep/Makefile +++ b/devel/fastdep/Makefile @@ -17,7 +17,6 @@ COMMENT= Fast dependency generator for C/C++ files USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-local-gnugetopt -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCS= AUTHORS CHANGELOG INSTALL README \ doc/fastdep.html doc/fastdep.pdf doc/c*.htm diff --git a/devel/fga/Makefile b/devel/fga/Makefile index df87bb1e81e7..3d9db9beeb49 100644 --- a/devel/fga/Makefile +++ b/devel/fga/Makefile @@ -20,8 +20,6 @@ USE_GMAKE= yes CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -MAKE_ENV+= LDFLAGS="${LDFLAGS}" - EXAMPLES= graph_gen maxbit tsp tsp_bf .if !defined(NOPORTDOCS) diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile index 1825617829c9..60d825a578a8 100644 --- a/devel/fhist/Makefile +++ b/devel/fhist/Makefile @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Utilities to maintain file history, do file comparisions and merges GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= binaries po MAKE_JOBS_UNSAFE= yes @@ -23,8 +22,8 @@ MAN1= fcomp.1 fhist.1 fmerge.1 PLIST_FILES= bin/fcomp bin/fhist bin/fmerge CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index 79fdf2e83d52..9d7a8931ec66 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -30,7 +30,7 @@ USE_GMAKE= yes USE_GNOME= glib20 gnomehack NOT_FOR_ARCHS= ia64 -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +CFLAGS+= -fPIC CONFIGURE_ARGS= --disable-Werror post-patch: diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index e3bf5dbbfc1f..960721705e42 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -22,9 +22,8 @@ USE_GNOME?= gnomehack _glib20 USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -DHAVE_LINUX -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFLICTS= fam-[0-9]* diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile index 9a01be98d4f0..585890790e70 100644 --- a/devel/gaul/Makefile +++ b/devel/gaul/Makefile @@ -24,8 +24,8 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS} USE_LDCONFIG= yes post-patch: diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index 08b47800e4e9..ba57720a4454 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -27,8 +27,8 @@ USE_GNOME= gnomeprefix gnomehack glib12 gtk12 oaf libxml orbit USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE=yes .include <bsd.port.mk> diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 4582b4071659..4a5254f22cbd 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -38,8 +38,8 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc # --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gconftool-2.1 gsettings-data-convert.1 \ gsettings-schema-convert.1 diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 77a1d3ed0ebe..ee4b34386993 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ --with-libiconv-prefix=${LOCALBASE} \ --with-system-readline \ diff --git a/devel/geany/Makefile b/devel/geany/Makefile index 3a1eae0f5226..d3b3b4877c86 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -18,8 +18,8 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= VTE "Enable Virtual Terminal Emulation support" on \ NLS "Enable Native Language support" on diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index d11ad707eb0c..363194dc5b9f 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -149,11 +149,11 @@ MAN8= gearmand.8 # This hack is required for the test programs invoked by configure, # in the event that libmemcached was compiled with SASL support. .if exists(${LOCALBASE}/lib/libsasl.so) -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lsasl" +LDFLAGS+= -L${LOCALBASE}/lib -lsasl .elif exists(${LOCALBASE}/lib/libsasl2.a) -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lsasl2" +LDFLAGS+= -L${LOCALBASE}/lib -lsasl2 .else -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .endif .ifdef(WITH_DRIZZLE) diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 689c571f68da..dc58f03bb69d 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -26,9 +26,9 @@ CONFIGURE_ENV= ACLOCAL="${TRUE}" \ AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" \ MAKEINFO="makeinfo --no-split" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ EMACS="no" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-csharp --disable-threads --disable-openmp \ --with-included-gettext --with-included-glib \ --with-included-libcroco --with-included-libxml \ diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile index 216ade319a75..bdc7531056ac 100644 --- a/devel/giggle/Makefile +++ b/devel/giggle/Makefile @@ -27,8 +27,8 @@ USE_GNOME= glib20 gtk20 gtksourceview2 libglade2 USE_GETTEXT= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl PLIST_SUB+= GIGGLE_VER=${PORTVERSION} .include <bsd.port.options.mk> diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index c9e69afa9c87..e105852122f0 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -18,8 +18,8 @@ MAINTAINER= johans@FreeBSD.org COMMENT= GNU indent GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1 +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --program-prefix=g MAKE_JOBS_UNSAFE= yes diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 4be1789c5448..c3a0cb764176 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -32,9 +32,9 @@ USE_FAM= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl .include <bsd.port.mk> diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index dfd7f6c1039e..3793f66ac6c1 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -25,8 +25,8 @@ INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix intlhack gnomehack gtk20 desktopfileutils USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= GNOME "Enable gnome support" on #\ # GNOMEDB "Enable libgnomedb support" off diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index da51a9fdd5cd..607d03cea87b 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -25,8 +25,8 @@ USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/gladeui diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile index 8ddd86d519cb..467d90c7a016 100644 --- a/devel/glib-java/Makefile +++ b/devel/glib-java/Makefile @@ -25,7 +25,7 @@ JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack glib20 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} -CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" +CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd GLIB_API_VERSION= 0.4 PLIST_SUB= GLIB_API_VERSION=${GLIB_API_VERSION} PORTNAME=${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 1b1e98c8f44c..658a568b3042 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -47,10 +47,10 @@ CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --disable-dtrace \ --with-pcre=system \ --disable-fam -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl OPTIONS= COLLATION_FIX "fix string collation" off diff --git a/devel/glog/Makefile b/devel/glog/Makefile index 53e3f977eafd..efda154dcc13 100644 --- a/devel/glog/Makefile +++ b/devel/glog/Makefile @@ -21,7 +21,7 @@ USE_LDCONFIG= yes USE_GCC= 4.2+ PROJECTHOST= google-glog -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo" +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo .include <bsd.port.pre.mk> diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile index 11a5ced7b335..912df61b6275 100644 --- a/devel/gnome-crash/Makefile +++ b/devel/gnome-crash/Makefile @@ -17,7 +17,7 @@ COMMENT= A small coredump analysis tool for GNOME USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libglade gnomeprint GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile index bd25b6d8e21b..ca0a19361a0c 100644 --- a/devel/gnome-vfs-monikers/Makefile +++ b/devel/gnome-vfs-monikers/Makefile @@ -17,7 +17,7 @@ COMMENT= Gnome-vfs monikers module USE_GNOME= gnomevfs2 libbonobo USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 78dd001d229d..540f254749fd 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --enable-openssl \ --disable-howl \ --with-hal-mount=/sbin/mount \ --with-hal-umount=/sbin/umount -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB=\"${PTHREAD_LIBS}\"" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DPTHREAD_LIB="${PTHREAD_LIBS}" LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PKGINSTALL= ${WRKDIR}/pkg-install diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index a9f619bcc22d..2c7e99fc5740 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -24,9 +24,9 @@ USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LATEST_LINK= gnome-vfs1 diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 9b357dd59f23..27352b2f95a9 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -21,8 +21,7 @@ GNU_CONFIGURE= yes MAKE_FLAGS= OPTFLAG="${CFLAGS}" CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \ - CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" CONFIGURE_ARGS+= --with-thread-lib="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf CONFIGURE_ARGS+= --with-layout=gnustep diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 7e8b8a130d9c..82082129511f 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -17,8 +17,8 @@ COMMENT= A preprocessor for making GObjects with inline C USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= glib20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/gob2 share/aclocal/gob2.m4 ${EXAMPLES:S/^/%%EXAMPLESDIR%%\//} PLIST_DIRS= %%EXAMPLESDIR%% diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index fab681569648..fff14c21b392 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -28,8 +28,8 @@ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-tests # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index 35f4dc0b9b29..763931a3a336 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CPPFLAGS= "-I${LOCALBASE}/include" -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} \ SHORT_VER=0.8 diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile index 968ffa71a523..118f40332dfa 100644 --- a/devel/goffice04/Makefile +++ b/devel/goffice04/Makefile @@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile index 1a753bb6b1a9..38a5d523e252 100644 --- a/devel/goffice06/Makefile +++ b/devel/goffice06/Makefile @@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile index 03fd16328a65..e8ec7fafc96a 100644 --- a/devel/goffice1/Makefile +++ b/devel/goffice1/Makefile @@ -24,8 +24,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile index 008c7c1411b6..716b45ded77f 100644 --- a/devel/gpsim/Makefile +++ b/devel/gpsim/Makefile @@ -21,7 +21,8 @@ RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 3ac9cc624ab8..8324453d6c30 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -23,8 +23,8 @@ USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgnuregex" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex CONFIGURE_ARGS= --disable-debug \ --enable-compile-warnings=no diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile index 38a669266387..d3720d72420f 100644 --- a/devel/guichan/Makefile +++ b/devel/guichan/Makefile @@ -20,8 +20,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= gnomehack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} OPTIONS= SDL "Enable SDL support" On \ ALLEGRO "Enable Allegro support" Off \ diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile index 7f881c08c795..9e111d5d59e3 100644 --- a/devel/guikachu/Makefile +++ b/devel/guikachu/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= guikachu-form-editor.schemas guikachu-interface.schemas \ guikachu-mainwin.schemas diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 6353d38d69e2..b05b9c286751 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -26,8 +26,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-obexftp OPTIONS= FUSE "Enable fuse" off \ AVAHI "Enable AVAHI" on \ diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile index 44b4278bd75d..e0017155b63a 100644 --- a/devel/idutils/Makefile +++ b/devel/idutils/Makefile @@ -19,8 +19,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USE_XZ= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INFO= idutils MAN1= aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1 diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile index 361355938c6a..8d830426fe4a 100644 --- a/devel/ixlib/Makefile +++ b/devel/ixlib/Makefile @@ -19,8 +19,8 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include MAKE_ENV+= SED="sed" USE_LDCONFIG= yes diff --git a/devel/jna/files/patch-native_Makefile b/devel/jna/files/patch-native_Makefile index 90d7f167fa02..3a4d9479249f 100644 --- a/devel/jna/files/patch-native_Makefile +++ b/devel/jna/files/patch-native_Makefile @@ -3,6 +3,15 @@ $FreeBSD$ --- native/Makefile.orig +++ native/Makefile +@@ -20,6 +20,8 @@ + # protection simply by defining HAVE_PROTECTION. This has been enabled + # only for those platforms on which it has been tested successfully. + ++unexport LDFLAGS ++ + OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \ + -e 's/SunOS.*/solaris/g' \ + -e 's/FreeBSD.*/freebsd/g' \ @@ -135,7 +135,7 @@ ifeq ($(OS),freebsd) ARCH=$(shell uname -m | sed 's/i.86/i386/g') diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index afe699117f87..acc1af85405b 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -22,7 +22,7 @@ USE_XZ= yes USE_GNOME= glib20 gnomehack gnomeprefix ltverhack USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile index b018d82fc5b3..60d89654f9fd 100644 --- a/devel/jzmq/Makefile +++ b/devel/jzmq/Makefile @@ -23,7 +23,8 @@ USE_JAVA= 1.4+ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-zeromq=${LOCALBASE} -CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} LDFLAGS=${PTHREAD_LIBS} +CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} +LDFLAGS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes PLIST_FILES= %%JAVAJARDIR%%/zmq.jar \ diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile index 48ffa91bf79d..7f0a96ce07a7 100644 --- a/devel/kscope/Makefile +++ b/devel/kscope/Makefile @@ -27,7 +27,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes MAKE_ENV= EXTRA_LIBRARIES="-L${LOCALBASE}/lib" -CONFIGURE_ENV= CXXFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} +CXXFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index 796c96e7ea8e..e2197dea35c0 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool USE_SDL= image sdl USE_GNOME= lthack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/lfcxml/Makefile b/devel/lfcxml/Makefile index 5717fd9dede1..82fd63a17f29 100644 --- a/devel/lfcxml/Makefile +++ b/devel/lfcxml/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= lfc.1:${PORTSDIR}/devel/lfc LICENSE= GPLv2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf:env diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile index 9f99ed56b24b..832c9f3119b2 100644 --- a/devel/libIDL/Makefile +++ b/devel/libIDL/Makefile @@ -24,8 +24,8 @@ USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INFO= libIDL2 diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile index ef40279a8431..aa5c1f5bd444 100644 --- a/devel/libassetml/Makefile +++ b/devel/libassetml/Makefile @@ -23,8 +23,8 @@ USE_GNOME= gnomehack lthack gnomeprefix glib20 libxml2 pkgconfig USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include INFO= libassetml diff --git a/devel/libast/Makefile b/devel/libast/Makefile index 0f76d804ec1a..2c59f63f7ace 100644 --- a/devel/libast/Makefile +++ b/devel/libast/Makefile @@ -21,8 +21,8 @@ USE_AUTOTOOLS= libtool USE_GNOME= gnomehack USE_EFL= imlib2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile index a36c28e79d93..12954abe6da6 100644 --- a/devel/libbinio/Makefile +++ b/devel/libbinio/Makefile @@ -22,10 +22,8 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CFLAGS+= ${CPPFLAGS} +CXXFLAGS+= ${CPPFLAGS} post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src|; \ diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index e89182d4ff92..21bb9cb5e720 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -31,8 +31,8 @@ USE_PERL5= yes USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale MAN1= bonobo-activation-server.1 diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile index b88f04c8560a..482a037378ba 100644 --- a/devel/libccid/Makefile +++ b/devel/libccid/Makefile @@ -23,10 +23,10 @@ GNU_CONFIGURE= yes USE_PERL5_BUILD=yes CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \ --enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \ - LIBUSB_CFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= LIBUSB_CFLAGS="-I${LOCALBASE}/include" \ LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} PLIST_SUB= VER=${PORTVERSION} diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile index 110f97de87dd..870dc449b8f4 100644 --- a/devel/libdlna/Makefile +++ b/devel/libdlna/Makefile @@ -28,7 +28,6 @@ MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+= --prefix="${PREFIX}" --disable-optimize \ --includedir=${LOCALBASE}/include \ --libdir=${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile index ef10f39b2cc0..b426d20c9d89 100644 --- a/devel/libdwarf/Makefile +++ b/devel/libdwarf/Makefile @@ -25,8 +25,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libelf.so.0:${PORTSDIR}/devel/libelf WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/libdwarf GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I. -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I. -I${LOCALBASE}/include USE_DOS2UNIX= *.h diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile index aa96ae1d1a5c..bd33b4d12b92 100644 --- a/devel/libelf/Makefile +++ b/devel/libelf/Makefile @@ -29,8 +29,8 @@ USE_LDCONFIG= yes NOMAN= defined .if !defined(WITHOUT_NLS) -CPPFLAGS= "-I${LOCALBASE}/include" -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl CONFIGURE_ARGS+= --enable-nls USE_GETTEXT= yes PLIST_SUB+= GETTEXT="" diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile index 206d7358ebba..34e18f27e627 100644 --- a/devel/libftdi/Makefile +++ b/devel/libftdi/Makefile @@ -17,7 +17,7 @@ OPTIONS= BOOST "Build with boost" off USE_AUTOTOOLS= autoconf libtool automake GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" +CFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes USE_GNOME= pkgconfig gnomehack diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile index a85678f9a526..b056f7ca0546 100644 --- a/devel/libgalago/Makefile +++ b/devel/libgalago/Makefile @@ -24,7 +24,8 @@ USE_GETTEXT= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-configure: @${ECHO_CMD} "#define HAVE_STRCHR 1" >> ${WRKSRC}/config.h diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile index 0f5804b0eab4..e923766340b3 100644 --- a/devel/libgconf-java/Makefile +++ b/devel/libgconf-java/Makefile @@ -28,7 +28,7 @@ JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack gconf2 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} -CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" +CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd GCONF_API_VERSION= 2.12 GTK_API_VERSION= 2.10 diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile index f5dae65f757f..69e93d655da1 100644 --- a/devel/libgdata/Makefile +++ b/devel/libgdata/Makefile @@ -24,8 +24,8 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack intltool ltverhack glib20 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc" .include <bsd.port.mk> diff --git a/devel/libgiigic/Makefile b/devel/libgiigic/Makefile index bf0eceab67a2..4496cf1b006f 100644 --- a/devel/libgiigic/Makefile +++ b/devel/libgiigic/Makefile @@ -24,7 +24,8 @@ USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} MAN3= gicActionLazyAction.3 \ gicActionWrite.3 \ diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile index 7fd97465bf1a..e31fdf43620a 100644 --- a/devel/libglade-java/Makefile +++ b/devel/libglade-java/Makefile @@ -30,7 +30,7 @@ JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack libglade2 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} -CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" +CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd GLADE_API_VERSION= 2.12 GTK_API_VERSION= 2.10 diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index e523e721ca7c..ea3f6f575b6a 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -21,7 +21,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 735874e56be6..63a66c6f6f16 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -31,8 +31,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc \ --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \ CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports" diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index bef568f619a4..33dec365189e 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -22,8 +22,8 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ --with-bz2 --with-gnome-vfs --with-gio -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lgsf-1 GSF_SLAVE= yes diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index edb46cbbf5d0..9bef7963aa5a 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -28,8 +28,8 @@ USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack USE_AUTOTOOLS= libtool CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \ --without-bonobo -CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(GSF_SLAVE) MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index e409d3a29874..d03b22144153 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -28,8 +28,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H +LDFLAGS+= -L${LOCALBASE}/lib INFO= libgtop2 diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile index 987acc7bcf07..93d7251fe1db 100644 --- a/devel/libgutenfetch/Makefile +++ b/devel/libgutenfetch/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include USE_GMAKE= yes USE_BZIP2= yes diff --git a/devel/libical/Makefile b/devel/libical/Makefile index 47c5db343215..a83df975cfc7 100644 --- a/devel/libical/Makefile +++ b/devel/libical/Makefile @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5_BUILD=yes USE_LDCONFIG= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include .if !defined(WITHOUT_PYTHON) CONFIGURE_ARGS= --enable-python=yes @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --enable-python=no .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +CFLAGS+= -fPIC .endif .include <bsd.port.post.mk> diff --git a/devel/libleaftag/Makefile b/devel/libleaftag/Makefile index 82c0ca2263a1..5022ce0198ec 100644 --- a/devel/libleaftag/Makefile +++ b/devel/libleaftag/Makefile @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile index 0643fd1d7ff4..e6df2e68f06f 100644 --- a/devel/libmaa/Makefile +++ b/devel/libmaa/Makefile @@ -17,7 +17,7 @@ COMMENT= Provides a few data structures and helpful functions ALL_TARGET= lib CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \ --with-etcdir=${PREFIX}/etc -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool diff --git a/devel/libmba/Makefile b/devel/libmba/Makefile index 343cddefa6e4..b568b507064e 100644 --- a/devel/libmba/Makefile +++ b/devel/libmba/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes MAKE_ENV= prefix="${PREFIX}" \ MINVERSION="${SHLIB_MAJOR}" \ - RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include" +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" USE_LDCONFIG= yes diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index a0e0b3c13e62..c9d456a51488 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -83,8 +83,8 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/lib .if defined(WITH_PN531USB) || defined(WITH_PN533USB) .if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .endif .endif diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index 57f5632b0ea6..2451455929b0 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -26,7 +26,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index acd86dde0833..f7c4a99435a4 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --with-hal -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile index 75a59477408d..5f1921dbd36a 100644 --- a/devel/liboop/Makefile +++ b/devel/liboop/Makefile @@ -24,13 +24,12 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GNOME= glib12 glib20 gnomehack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-libwww USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes -CPPFLAGS= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|8\.4|84|g' ${WRKSRC}/configure diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile index 3a66e9a02968..214f357dd9ac 100644 --- a/devel/libopensync022/Makefile +++ b/devel/libopensync022/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13 USE_BZIP2= yes -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes USE_BZIP2= yes USE_PYTHON= yes diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile index 68d15c580ba7..e4d7ea0037b9 100644 --- a/devel/libopkele/Makefile +++ b/devel/libopkele/Makefile @@ -26,11 +26,10 @@ USE_LDCONFIG= yes USE_GNOME= pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= "OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \ - OPENSSL_LIBS=-L${OPENSSLLIB} \ - CPPFLAGS=-I${LOCALBASE}/include - + OPENSSL_LIBS=-L${OPENSSLLIB} +CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -LDFLAGS= "-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/devel/libpafe/Makefile b/devel/libpafe/Makefile index e2321e85ef3a..3601f8b878ee 100644 --- a/devel/libpafe/Makefile +++ b/devel/libpafe/Makefile @@ -27,8 +27,8 @@ PLIST_DIRS= include/libpafe .if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" \ - LDFLAGS="${LDFLAGS} -L${PREFIX}/lib" +CPPFLAGS+= -I${PREFIX}/include +LDFLAGS+= -L${PREFIX}/lib .endif .include <bsd.port.post.mk> diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile index 94d60f3b6f0b..9fe23bb1479a 100644 --- a/devel/libphish/Makefile +++ b/devel/libphish/Makefile @@ -20,10 +20,9 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -DFreeBSD -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DFreeBSD +LDFLAGS+= -L${LOCALBASE}/lib post-install: .if !defined(NOPORTDOCS) diff --git a/devel/libpthread-stubs/Makefile b/devel/libpthread-stubs/Makefile index 540d1137f77a..0913a917192d 100644 --- a/devel/libpthread-stubs/Makefile +++ b/devel/libpthread-stubs/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} < 700000 -CONFIGURE_ENV+= LDFLAGS=-lpthread +LDFLAGS+= -lpthread .endif .include <bsd.port.post.mk> diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile index 39cfadb081c6..381c8e1d64a7 100644 --- a/devel/librcc/Makefile +++ b/devel/librcc/Makefile @@ -30,11 +30,10 @@ USE_ICONV= yes USE_LDCONFIG= yes USE_AUTOTOOLS= autoheader -CPPFLAGS= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LIBS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LIBS="${LIBS}" \ +CONFIGURE_ENV= LIBS="${LIBS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" OPTIONS= BDB "Translation database support" off \ diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile index 8e43961debfb..7bdcc02ea11c 100644 --- a/devel/libsigcx/Makefile +++ b/devel/libsigcx/Makefile @@ -21,8 +21,9 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 USE_GNOME= gnomehack gtk20 USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \ - ac_cv_path_DOXYGEN="" +CONFIGURE_ENV= ac_cv_path_DOXYGEN="" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index ed0ff90726f7..ed37b0d69ae3 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -30,8 +30,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="2.4" diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index e2dde7b61e6c..83dbe9b7d325 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="2.2" diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile index 3a11110b9f0c..daf1d15ebb73 100644 --- a/devel/libtar/Makefile +++ b/devel/libtar/Makefile @@ -17,7 +17,6 @@ COMMENT= A library for manipulating POSIX and GNU tar files USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" post-install: ${INSTALL_DATA} ${WRKSRC}/lib/libtar.so.0 ${PREFIX}/lib diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile index 1c565645a56c..c241900c9431 100644 --- a/devel/libtifiles2/Makefile +++ b/devel/libtifiles2/Makefile @@ -31,6 +31,5 @@ PLIST_SUB= NLS="@comment " CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" .include <bsd.port.mk> diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile index 4caa9f3c5d36..8823100559b9 100644 --- a/devel/libunicode/Makefile +++ b/devel/libunicode/Makefile @@ -23,8 +23,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ --datadir=${PREFIX}/share -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/devel/libuninum/Makefile b/devel/libuninum/Makefile index 9fad8cf742d4..a74c5911cd32 100644 --- a/devel/libuninum/Makefile +++ b/devel/libuninum/Makefile @@ -17,7 +17,6 @@ COMMENT= Library for converting Unicode strings to numbers LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile index 1a350967392e..bf4678731ea1 100644 --- a/devel/libvanessa_adt/Makefile +++ b/devel/libvanessa_adt/Makefile @@ -21,8 +21,8 @@ USE_LDCONFIG= YES USE_AUTOTOOLS= libtool GNU_CONFIGURE= YES -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} "s,^SUBDIRS = libvanessa_adt test debian,SUBDIRS = libvanessa_adt," \ diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile index 3f35612e6762..89bd42c9543b 100644 --- a/devel/libvanessa_socket/Makefile +++ b/devel/libvanessa_socket/Makefile @@ -24,7 +24,7 @@ MAN1= vanessa_socket_pipe.1 USE_AUTOTOOLS= libtool USE_LDCONFIG= YES GNU_CONFIGURE= YES -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile index 6b30155a10dc..220f14804116 100644 --- a/devel/libzrtpcpp/Makefile +++ b/devel/libzrtpcpp/Makefile @@ -24,7 +24,6 @@ USE_OPENSSL= yes CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes post-patch: diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile index 7854d363e2a4..24d58c345b19 100644 --- a/devel/libzvbi/Makefile +++ b/devel/libzvbi/Makefile @@ -25,7 +25,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAN1= zvbi-ntsc-cc.1 -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -L/usr/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L/usr/lib" +CFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile index f0526f350711..f94c018a594b 100644 --- a/devel/log4cplus/Makefile +++ b/devel/log4cplus/Makefile @@ -17,8 +17,8 @@ COMMENT= A logging library for C++ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} +CFLAGS+= ${PTHREAD_CFLAGS} MAKE_JOBS_UNSAFE= yes .if !defined(NOPORTDOCS) diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile index 9e6037ad9b7c..2cf0a2c21874 100644 --- a/devel/log4cpp/Makefile +++ b/devel/log4cpp/Makefile @@ -17,7 +17,8 @@ COMMENT= A library of C++ classes for flexible logging USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-pthreads --disable-html-docs USE_LDCONFIG= yes diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile index 2e0c00853a0d..e601d5f748bb 100644 --- a/devel/log4shib/Makefile +++ b/devel/log4shib/Makefile @@ -18,7 +18,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig gnomehack -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-pthreads --disable-html-docs --disable-doxygen USE_LDCONFIG= yes diff --git a/devel/love/Makefile b/devel/love/Makefile index fcbc4edc5f5f..25552e3dc770 100644 --- a/devel/love/Makefile +++ b/devel/love/Makefile @@ -25,9 +25,9 @@ USE_SDL= sdl mixer USE_GL= gl glu USE_LUA= 5.1+ GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ - -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \ - LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ + -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` +LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib PLIST_FILES= bin/love diff --git a/devel/love07/Makefile b/devel/love07/Makefile index fcbc4edc5f5f..25552e3dc770 100644 --- a/devel/love07/Makefile +++ b/devel/love07/Makefile @@ -25,9 +25,9 @@ USE_SDL= sdl mixer USE_GL= gl glu USE_LUA= 5.1+ GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ - -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \ - LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ + -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` +LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib PLIST_FILES= bin/love diff --git a/devel/love5/Makefile b/devel/love5/Makefile index fcbc4edc5f5f..25552e3dc770 100644 --- a/devel/love5/Makefile +++ b/devel/love5/Makefile @@ -25,9 +25,9 @@ USE_SDL= sdl mixer USE_GL= gl glu USE_LUA= 5.1+ GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ - -I${LUA_INCDIR} `${SDL_CONFIG} --cflags`" \ - LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ + -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` +LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib PLIST_FILES= bin/love diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile index a60c1f810525..28a6fca984d0 100644 --- a/devel/luabind/Makefile +++ b/devel/luabind/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs USE_LUA= 5.1+ USE_LDCONFIG= yes -CPPFLAGS= -I.. -I${LUA_INCDIR} -I${LOCALBASE}/include -LDFLAGS= -L${LUA_LIBDIR} +CPPFLAGS+= -I.. -I${LUA_INCDIR} -I${LOCALBASE}/include +LDFLAGS+= -L${LUA_LIBDIR} CXXFLAGS+= -fPIC PORTDOCS= * diff --git a/devel/mico/Makefile b/devel/mico/Makefile index f4a54f06b673..459b75038a3f 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --disable-coss MICO_SERVICE= "@comment " .endif -CONFIGURE_ENV+= CXXFLAGS="${CPPFLAGS} -Wno-unused" +CXXFLAGS+= ${CPPFLAGS} -Wno-unused .if defined(WITH_X11) USE_XORG= x11 @@ -84,7 +84,6 @@ MICO_GTK= "@comment " LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 CONFIGURE_ARGS+= --with-tcl CPPFLAGS+= -I${LOCALBASE}/include/tcl8.3 -CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS} .else MICO_TCL= "@comment " .endif diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 07ececf41dcb..6a053e5832ab 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -30,9 +30,9 @@ USE_GMAKE= yes USE_LUA= 5.1+ GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - MAKEINFO="makeinfo --no-split" +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/mtn bin/mtn-cleanup bin/mtnopt \ share/monotone/hooks/authorize_remote_automate.lua \ diff --git a/devel/newt/Makefile b/devel/newt/Makefile index 99122c7f1401..7a56bbefb98a 100644 --- a/devel/newt/Makefile +++ b/devel/newt/Makefile @@ -54,7 +54,7 @@ USE_TCL= 84+ TCLSUFFIX= -${TCL_NODOT} MAKE_ENV+= WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q} PLIST_SUB+= TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX} -CONFIGURE_ENV+= CPPFLAGS=-I${TCL_INCLUDEDIR:Q} +CPPFLAGS+= -I${TCL_INCLUDEDIR:Q} SUB_FILES+= pkgIndex.tcl pre-su-install: diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 48aaba8c5f03..b3c9aac0b39a 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -29,8 +29,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static --enable-shared \ --disable-more-warnings -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include MAN1= oafd.1 diff --git a/devel/obby/Makefile b/devel/obby/Makefile index 980c6988312a..59461cb333ca 100644 --- a/devel/obby/Makefile +++ b/devel/obby/Makefile @@ -24,7 +24,8 @@ CONFIGURE_ARGS= --without-howl USE_LDCONFIG= yes .if !defined(WITHOUT_NLS) -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GETTEXT= yes PLIST_SUB+= NLS="" .else diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile index f53bc0c2ae52..d57be32f6842 100644 --- a/devel/ocaml-sdl/Makefile +++ b/devel/ocaml-sdl/Makefile @@ -25,8 +25,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_LDCONFIG=yes USE_SDL= sdl ttf image mixer GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-findlib DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} diff --git a/devel/ois/Makefile b/devel/ois/Makefile index 06d592d9a79a..f4e9d8998edb 100644 --- a/devel/ois/Makefile +++ b/devel/ois/Makefile @@ -23,7 +23,8 @@ USE_XORG= x11 xaw USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile index 9ede9ef6bf1d..8ccddd759e17 100644 --- a/devel/omniNotify/Makefile +++ b/devel/omniNotify/Makefile @@ -33,8 +33,7 @@ MAKEFILE= GNUmakefile USE_LDCONFIG= yes CONFIGURE_SCRIPT= ../configure -CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \ - CPP=${CPP} PYTHON=${PYTHON_CMD} +CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-omniorb=${LOCALBASE} .include <bsd.port.pre.mk> diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index 17b2e42b3ad1..bce99079c319 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -20,8 +20,7 @@ USE_OPENSSL= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes MAKEFILE= GNUmakefile -CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CPP=${CPP} \ - PYTHON=${PYTHON_CMD} +CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \ --with-omniORB-config=${PREFIX}/etc/omniORB.cfg \ --with-omniNames-logdir=/var/log diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile index 9bffe680b778..f08007627561 100644 --- a/devel/pcre++/Makefile +++ b/devel/pcre++/Makefile @@ -21,8 +21,8 @@ PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \ - LDFLAGS="`${PCRE_CONFIG} --libs`" +CPPFLAGS+= `${PCRE_CONFIG} --cflags` +LDFLAGS+= `${PCRE_CONFIG} --libs` USE_LDCONFIG= yes MAN3= Pcre.3 diff --git a/devel/pecl-statgrab/Makefile b/devel/pecl-statgrab/Makefile index db0576029225..5afda4a250df 100644 --- a/devel/pecl-statgrab/Makefile +++ b/devel/pecl-statgrab/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= statgrab.8:${PORTSDIR}/devel/libstatgrab USE_PHP= yes USE_PHPEXT= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -ldevstat ${EXTRA_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -ldevstat ${EXTRA_LIBS} CONFIGURE_ARGS= --with-statgrab=${LOCALBASE} diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile index 9f91b4ce083d..aaf5a56edee9 100644 --- a/devel/picprog/Makefile +++ b/devel/picprog/Makefile @@ -15,8 +15,6 @@ COMMENT= Serial port pic16c84 programmer USE_GMAKE= yes -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - PLIST_FILES= bin/picprog MAN1= picprog.1 diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile index f810e2b2f7da..35fa7d918b42 100644 --- a/devel/pikdev/Makefile +++ b/devel/pikdev/Makefile @@ -26,9 +26,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" CONFIGURE_ARGS+= --with-pic=yes -MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" SUB_FILES= pkg-message OPTIONS= DEBUG "Enable debug information" off \ diff --git a/devel/popt/Makefile b/devel/popt/Makefile index f9ac93bdc539..604b4b7a21f1 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -15,8 +15,8 @@ COMMENT= A getopt(3) like library with a number of enhancements, from Redhat CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --program-prefix="" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack diff --git a/devel/present/Makefile b/devel/present/Makefile index 59fa94365f85..94889dcc1a9a 100644 --- a/devel/present/Makefile +++ b/devel/present/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice1 USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_GNOME= gnomehack intlhack ltverhack .include <bsd.port.mk> diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile index 179791a0a421..de0da6bae87b 100644 --- a/devel/protobuf-c/Makefile +++ b/devel/protobuf-c/Makefile @@ -21,7 +21,7 @@ USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "bin/ld"|g' ${WRKSRC}/configure diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile index 26d32b55405c..7146045b2e71 100644 --- a/devel/ptlib26/Makefile +++ b/devel/ptlib26/Makefile @@ -80,8 +80,8 @@ PLIST_SUB+= BSDVIDEO="@comment " .if defined(WITH_V4L) CONFIGURE_ARGS+=--enable-v4l --enable-v4l2 -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= V4L="" BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS+= v4l1.0:${PORTSDIR}/multimedia/libv4l diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 31f2887b253a..11c4bbe17334 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -36,13 +36,10 @@ MAKE_JOBS_UNSAFE= yes CFLAGS= -O1 -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - CFLAGS="${CFLAGS}" -MAKE_ENV= CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - STDCCFLAGS+="-I${LOCALBASE}" +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= STDCCFLAGS+="-I${LOCALBASE}" +CPPFLAGS+= -O1 -I${WRKSRC}/include -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if ${OSVERSION} >= 700042 CONFIGURE_ENV+= ATOMICITY_H="<ext/atomicity.h>" diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile index 1bf921ede24d..511231a88d86 100644 --- a/devel/py-itools/Makefile +++ b/devel/py-itools/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS+= ${BUILD_DEPENDS} LIB_DEPENDS= glib:${PORTSDIR}/devel/glib20 \ soup:${PORTSDIR}/devel/libsoup -MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib USE_PYTHON= 2.6+ USE_PYDISTUTILS= yes diff --git a/devel/py-libgsf/Makefile b/devel/py-libgsf/Makefile index a105bb7839a0..4b79f63c4cef 100644 --- a/devel/py-libgsf/Makefile +++ b/devel/py-libgsf/Makefile @@ -22,8 +22,8 @@ USE_GNOME= gnomehack libgsf_gnome gnomevfs2 ltverhack intlhack pygtk2 USE_PYTHON= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ --disable-gtk-doc --with-bz2 --with-gnome --with-python -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= GSF_SLAVE= yes diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile index 48d5e7a2eaca..0f81490c53a0 100644 --- a/devel/py-omniorb/Makefile +++ b/devel/py-omniorb/Makefile @@ -38,8 +38,7 @@ MAKEFILE= GNUmakefile USE_LDCONFIG= yes CONFIGURE_SCRIPT= ../configure -CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \ - CPP=${CPP} PYTHON=${PYTHON_CMD} +CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE} pre-configure: diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index a772e5720d5a..c11841eb56cb 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -26,6 +26,6 @@ USE_GNOME= gnomehack orbit2 USE_PYTHON= yes GNU_CONFIGURE= yes ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile index 194648b439a0..e3d105d621bb 100644 --- a/devel/py-shapely/Makefile +++ b/devel/py-shapely/Makefile @@ -17,7 +17,6 @@ COMMENT= Python Package for Manipulation 2D Geospatial Geometry LIB_DEPENDS= geos_c.8:${PORTSDIR}/graphics/geos CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= CFLAGS="${CFLAGS}" USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile index bf43d4bf8972..1d7ee637cb65 100644 --- a/devel/raknet/Makefile +++ b/devel/raknet/Makefile @@ -27,8 +27,8 @@ ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \ -I ${LOCALBASE}/share/aclocal \ -I ${WRKDIR}/autotools/m4 GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(cpp|h) diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile index 0939a3865732..07a089720672 100644 --- a/devel/regexx/Makefile +++ b/devel/regexx/Makefile @@ -18,7 +18,7 @@ COMMENT= A complete regular expressions C++ solution USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre" +MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre" post-patch: @${REINPLACE_CMD} -e 's|@LIBTOOL@|${LIBTOOL}|g ; \ diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile index 64f2c5b80379..c5db8e5aa064 100644 --- a/devel/regexxer/Makefile +++ b/devel/regexxer/Makefile @@ -22,8 +22,8 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intltool intlhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= regexxer.schemas INSTALLS_ICONS= regexxer.png diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile index 5d093fabfd94..f67fbb79fd68 100644 --- a/devel/rsvndump/Makefile +++ b/devel/rsvndump/Makefile @@ -32,7 +32,7 @@ PLIST_FILES+= bin/rsvndump .include <bsd.port.pre.mk> .if ${OSVERSION} < 700041 -CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS} +LDFLAGS+= ${PTHREAD_LIBS} .endif .if !defined(NOPORTDOCS) diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 405cbad3c677..3c2b4f830173 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -26,7 +26,6 @@ USE_GNOME= gnomehack pkgconfig USE_ICONV= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ - LDFLAGS="${LDFLAGS}" \ ac_cv_header_libusbhid_h=no CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include diff --git a/devel/seed/Makefile b/devel/seed/Makefile index 94ebad53e7c5..ff664df17ce8 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -34,8 +34,8 @@ USE_GNOME= gnomehack gtk20 intltool libxml2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0 MAN1= seed.1 diff --git a/devel/sfslite-dbg/Makefile b/devel/sfslite-dbg/Makefile index 75a16bf56af6..d081efd334e8 100644 --- a/devel/sfslite-dbg/Makefile +++ b/devel/sfslite-dbg/Makefile @@ -13,5 +13,5 @@ COMMENT= sfslite with dmalloc and without optimization LIB_DEPENDS+= dmalloc:${PORTSDIR}/devel/dmalloc PKG_INSTALL= ${MASTERDIR}/pkg-install -CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile index 026f7f456b01..62123d651f82 100644 --- a/devel/shmap/Makefile +++ b/devel/shmap/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 8c7bddf7f5b9..24881bb9db30 100644 --- a/devel/silc-toolkit/Makefile +++ b/devel/silc-toolkit/Makefile @@ -46,7 +46,7 @@ PLIST_SUB+= PORTDOCS="@comment " .ifndef(WITH_PTHREADS) CONFIGURE_ARGS+= --without-pthreads .else -CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} .endif pre-everything:: diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 8f42acd77b76..e675cf438563 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -36,7 +36,6 @@ USE_GL= gl glu glut GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-jpeg-factory post-patch: diff --git a/devel/soup/Makefile b/devel/soup/Makefile index ec81e0ed5e1d..c01299641ba5 100644 --- a/devel/soup/Makefile +++ b/devel/soup/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gnomehack glib12 libxml USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile index 5c55dc097e85..dd4ab6404809 100644 --- a/devel/srecord/Makefile +++ b/devel/srecord/Makefile @@ -19,8 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/srec_cat \ diff --git a/devel/styx/Makefile b/devel/styx/Makefile index b9a308854f37..3cef89d5150b 100644 --- a/devel/styx/Makefile +++ b/devel/styx/Makefile @@ -19,8 +19,8 @@ USE_AUTOTOOLS= libtool USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} USE_LDCONFIG= yes diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile index efb8c13c1177..e51115afa817 100644 --- a/devel/subcommander/Makefile +++ b/devel/subcommander/Makefile @@ -26,8 +26,9 @@ USE_GMAKE= yes USE_QT_VER= 3 CONFIGURE_ARGS+=--with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \ --with-subversion=${LOCALBASE} -CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= QTDIR=${LOCALBASE} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} NO_LATEST_LINK= yes diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index ecb16a789e04..eb68530b3f1f 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -38,8 +38,8 @@ CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \ --with-apr=${LOCALBASE}/bin/apr-1-config \ --with-apr-util=${LOCALBASE}/bin/apu-1-config \ --with-openssl=${OPENSSLBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS} post-extract: @${CHMOD} +x ${WRKSRC}/configure diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index c1e1a4373aba..b482a0cc0a85 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -29,8 +29,8 @@ USE_GNOME= gnomehack glib20 USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` post-patch: diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile index 30012adbcbc7..d49938a31ae9 100644 --- a/devel/tdl/Makefile +++ b/devel/tdl/Makefile @@ -16,7 +16,6 @@ COMMENT= To-do list manager HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" MAN1= tdl.1 MLINKS= tdl.1 tdla.1 tdl.1 tdll.1 tdl.1 tdld.1 tdl.1 tdlg.1 diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile index 7a6830c3b95a..3ad8aa10f5a3 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -25,7 +25,7 @@ USE_GNOME= desktopfileutils gnomehack gtk20 glib20 intltool intlhack \ USE_XFCE= configenv libexo libutil thunar INSTALLS_ICONS= yes -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= NLS "Enable Native Language Support" on \ GIT "Enable Git support" off \ diff --git a/devel/tokamak/Makefile b/devel/tokamak/Makefile index 5fa583321d70..3602079ffb77 100644 --- a/devel/tokamak/Makefile +++ b/devel/tokamak/Makefile @@ -29,7 +29,7 @@ PORTDOCS= * .include <bsd.port.pre.mk> .if !defined(WITH_DEBUG) -MAKE_ENV+= CPPFLAGS=-DNDEBUG +CPPFLAGS+= -DNDEBUG .endif post-extract: diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile index 45349dd7ccf9..cd0a2dcd0220 100644 --- a/devel/ucommon/Makefile +++ b/devel/ucommon/Makefile @@ -17,7 +17,7 @@ COMMENT= A very light-weight C++ design patternlibrary USE_GNOME= pkgconfig gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} MAN1= args.1 car.1 commoncpp-config.1 mdsum.1 scrub-files.1 sockaddr.1 \ ucommon-config.1 zerofill.1 diff --git a/devel/urjtag/Makefile b/devel/urjtag/Makefile index d15094a63959..e4d634073a99 100644 --- a/devel/urjtag/Makefile +++ b/devel/urjtag/Makefile @@ -19,10 +19,10 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= --std=c99 MAN1= jtag.1 bsdl2jtag.1 diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile index 7b9ddfcf49e0..aab86d2ea54b 100644 --- a/devel/wand-libconfig/Makefile +++ b/devel/wand-libconfig/Makefile @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= include/libconfig.h lib/libconfig.a lib/libconfig.la \ lib/libconfig.so lib/libconfig.so.1 diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile index da3e3ed00c95..af126073881b 100644 --- a/devel/wininfo/Makefile +++ b/devel/wininfo/Makefile @@ -5,23 +5,23 @@ # $FreeBSD$ # -PORTNAME= wininfo -PORTVERSION= 0.7 +PORTNAME= wininfo +PORTVERSION= 0.7 PORTREVISION= 9 -CATEGORIES= devel -MASTER_SITES= http://www.freedesktop.org/software/wininfo/ +CATEGORIES= devel +MASTER_SITES= http://www.freedesktop.org/software/wininfo/ -MAINTAINER= ports@FreeBSD.org -COMMENT= A window information utility +MAINTAINER= ports@FreeBSD.org +COMMENT= A window information utility -USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \ - xcomposite x11 xres -USE_GNOME= gtk20 gnomeprefix pkgconfig -GNU_CONFIGURE= yes +USE_XORG= xext xrender xinerama xrandr xi xfixes xcursor \ + xcomposite x11 xres +USE_GNOME= gtk20 gnomeprefix pkgconfig +GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -MAN1= wininfo.1 +MAN1= wininfo.1 .include <bsd.port.mk> diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile index 55fe49514806..cef4a1d5595d 100644 --- a/devel/xdg-user-dirs/Makefile +++ b/devel/xdg-user-dirs/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_ICONV= yes USE_GMAKE= yes -CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile index b1a99d0fe7a2..e1a2e89d6dca 100644 --- a/devel/xwpe/Makefile +++ b/devel/xwpe/Makefile @@ -20,7 +20,6 @@ COMMENT= A Borland-like IDE programming environment USE_GMAKE= yes USE_XORG= sm ice x11 GNU_CONFIGURE= yes -CONFIGURE_ENV= CONFIGURE_ARGS= --libdir=${PREFIX}/share ALL_TARGET= # none diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile index 7fc6394f74db..6685c9f9dd4d 100644 --- a/devel/yasm/Makefile +++ b/devel/yasm/Makefile @@ -20,8 +20,8 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-python --disable-python-bindings -CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/devel/ztcl/Makefile b/devel/ztcl/Makefile index c2a650271cf7..582c5d1104d1 100644 --- a/devel/ztcl/Makefile +++ b/devel/ztcl/Makefile @@ -29,10 +29,8 @@ INFO= ${PORTNAME} ${PORTNAME}-zlib CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} \ --with-tclinclude=${TCL_INCLUDEDIR} \ --with-tclmorescripts=${PREFIX}/libexec/tclmore -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}" \ - LDFLAGS="${LDFLAGS} -L ${PREFIX}/lib" -MAKE_ENV+= CPPFLAGS="${CPPFLAGS} -I ${PREFIX}/include -I ${TCL_INCLUDEDIR}" \ - LDFLAGS="${LDFLAGS} -L ${PREFIX}/lib" +CPPFLAGS+= -I ${PREFIX}/include -I ${TCL_INCLUDEDIR} +LDFLAGS+= -L ${PREFIX}/lib .if !defined(NOPORTDOCS) PORTDOCS= * |