diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2011-09-24 06:26:39 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2011-09-24 06:26:39 +0800 |
| commit | e61d6a701f43e8cec5a4ec8c9641daf5376441de (patch) | |
| tree | 920c5861867d049fb1f1e03285110561450a4ac1 /net | |
| parent | 124c6dcab8f89a37ab971e5ad23a959bfaa97426 (diff) | |
| download | freebsd-ports-gnome-e61d6a701f43e8cec5a4ec8c9641daf5376441de.tar.gz freebsd-ports-gnome-e61d6a701f43e8cec5a4ec8c9641daf5376441de.tar.zst freebsd-ports-gnome-e61d6a701f43e8cec5a4ec8c9641daf5376441de.zip | |
- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead
PR: 157936
Submitted by: myself
Exp-runs by: pav
Approved by: pav
Diffstat (limited to 'net')
117 files changed, 186 insertions, 223 deletions
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index 5a585b8f2008..1f5bd098226d 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -38,7 +38,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_ENV+= MAKE="${MAKE}" \ DATADIR="${DATADIR}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" .include <bsd.port.pre.mk> diff --git a/net/arping/Makefile b/net/arping/Makefile index a59180eb230f..8d96f3b7933b 100644 --- a/net/arping/Makefile +++ b/net/arping/Makefile @@ -17,10 +17,10 @@ COMMENT= ARP level "ping" utility BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS+="`${LIBNET_CONFIG} --defines`" \ - CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="`${LIBNET_CONFIG} --libs` -lpcap" +CONFIGURE_ENV= LIBS="`${LIBNET_CONFIG} --libs` -lpcap" +CFLAGS+= `${LIBNET_CONFIG} --defines` +CPPFLAGS+= -I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags` +LDFLAGS+= -L${LOCALBASE}/lib LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index c47b4648063c..0eac20ff0e47 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -23,10 +23,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-gsm=${LOCALBASE} -LDFLAGS= -L${LOCALBASE}/lib -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_GNOME= libxml2 USE_BISON= build diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index dc3e047ee537..449eab1796d0 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -22,10 +22,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-gsm=${LOCALBASE} -LDFLAGS= -L${LOCALBASE}/lib -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_GNOME= libxml2 USE_BISON= build diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index a6b87537751a..dbfe2fb962a8 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -26,10 +26,10 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gsm=${LOCALBASE} -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_BISON= build USE_RC_SUBR= asterisk.sh diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 2796641e2d87..d7dc91b5813c 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -23,10 +23,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 sparc64 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gsm=${LOCALBASE} -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_GNOME= libxml2 USE_BISON= build diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index 5ce0a5f846a1..41b2a694cbe4 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -37,10 +37,10 @@ CONFIGURE_ARGS?=--with-distro=freebsd \ --disable-doxygen-dot \ --localstatedir=/var \ --enable-compat-howl -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE +LDFLAGS+= -L${LOCALBASE}/lib .if ${AVAHI_SLAVE}=="no" CONFLICTS= howl-[0-9]* diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile index 0d3ee5d1deff..b4f7ed3ac378 100644 --- a/net/bfilter/Makefile +++ b/net/bfilter/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= ACE.5:${PORTSDIR}/devel/ace \ sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN8= bfilter.8 USE_RC_SUBR= bfilter.sh diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 29b2593b900e..a1e5635ad218 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -17,7 +17,8 @@ COMMENT= Portable bandwidth monitor and rate estimator OPTIONS= RRDTOOL "Enable RRD support" Off \ DBI "Enable DBI support" On -CONFIGURE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib" "CPPFLAGS=-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= YES CONFIGURE_ARGS= --disable-asound USE_GMAKE= YES diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 18a462d4df46..f50b3c4b4774 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -36,7 +36,7 @@ CONFIGURE_ARGS= --disable-server CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS:= ${CXXFLAGS:N-O*:N-f*} -O3 CFLAGS:= ${CFLAGS:N-O*:N-f*} -O3 -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" CXXFLAGSS="${CXXFLAGS}" CFLAGS="${CFLAGS}" +CONFIGURE_ENV= CXXFLAGSS="${CXXFLAGS}" OPTIONS= X11 "Build Boinc Manager GUI" on \ ALT "Accept Linux science applications" off diff --git a/net/c3270/Makefile b/net/c3270/Makefile index 803801909020..f6308835e3e4 100644 --- a/net/c3270/Makefile +++ b/net/c3270/Makefile @@ -21,9 +21,9 @@ GNU_CONFIGURE= yes USE_ICONV= yes USE_OPENSSL= yes -CONFIGURE_ENV= CPPFLAGS="-I/usr/local/include" \ - LDFLAGS="-L/usr/local/lib" \ - LIBS="-L/usr/local/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= c3270.1 \ x3270if.1 \ diff --git a/net/clamz/Makefile b/net/clamz/Makefile index b9e76ea2e478..e564b7b6346a 100644 --- a/net/clamz/Makefile +++ b/net/clamz/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ expat.6:${PORTSDIR}/textproc/expat2 \ gcrypt.18:${PORTSDIR}/security/libgcrypt -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_GNOME= pkgconfig diff --git a/net/csync2/Makefile b/net/csync2/Makefile index b4c2a6878df5..f3da46f12009 100644 --- a/net/csync2/Makefile +++ b/net/csync2/Makefile @@ -30,9 +30,9 @@ MAN1= csync2.1 GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls" +CONFIGURE_ENV= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_RC_SUBR= csync2 diff --git a/net/ct/Makefile b/net/ct/Makefile index b6a39ac5e53f..8c966afc15f0 100644 --- a/net/ct/Makefile +++ b/net/ct/Makefile @@ -18,6 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/v6eval/bin/pktbuf:${PORTSDIR}/net/v6eval USE_PERL5= yes NO_BUILD= yes -MAKE_ENV+= "NUTTYPE=host" +MAKE_ENV+= "NUTTYPE=host" .include <bsd.port.mk> diff --git a/net/dante/Makefile b/net/dante/Makefile index b2c6414fd304..dd5539763bad 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -21,8 +21,8 @@ CONFLICTS= socks5-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ --with-sockd-conf=${PREFIX}/etc/sockd.conf -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} USE_LDCONFIG= yes diff --git a/net/daq/Makefile b/net/daq/Makefile index 01c17b0ac04e..ce36fba44ea5 100644 --- a/net/daq/Makefile +++ b/net/daq/Makefile @@ -26,7 +26,6 @@ USE_LDCONFIG= yes USE_BISON= build USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/net/dictd/Makefile b/net/dictd/Makefile index 385ff06a8e2f..fe3bf29d8112 100644 --- a/net/dictd/Makefile +++ b/net/dictd/Makefile @@ -26,8 +26,8 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \ --without-local-zlib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES+= dictd.conf pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile index 18b2cb38f69f..4bf30ac9f568 100644 --- a/net/easysoap/Makefile +++ b/net/easysoap/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index 8fa212fbada5..a676a5833097 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -29,9 +29,8 @@ INSTALLS_OMF= yes USE_GNOME= libgnomeui gnomeprefix gnomehack gnomedocutils \ evolutiondataserver intlhack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - SDL_CONFIG="${SDL_CONFIG}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-pwlib-dir=${LOCALBASE} \ --with-opal-dir=${LOCALBASE} MAKE_JOBS_SAFE= yes diff --git a/net/fonulator/Makefile b/net/fonulator/Makefile index 985f3ba9a86f..a26173a521a9 100644 --- a/net/fonulator/Makefile +++ b/net/fonulator/Makefile @@ -14,9 +14,8 @@ MAINTAINER= fjoe@FreeBSD.org COMMENT= A foneBRIDGE configuration utility GNU_CONFIGURE= yes -CONFIGURE_ENV=\ - CPPFLAGS="-I${LOCALBASE}/include ${LIBNET_CPPFLAGS}"\ - LDFLAGS="${LIBNET_LIBS:N-l*}" +CPPFLAGS+= -I${LOCALBASE}/include ${LIBNET_CPPFLAGS} +LDFLAGS+= ${LIBNET_LIBS:N-l*} CONFIGURE_ARGS= --disable-shared BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet\ diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 1ce0c3f46535..cd9f5bf9d091 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -22,9 +22,8 @@ USE_OPENSSL= yes USE_GNOME= gnomehack pkgconfig USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS}" +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile index 6afd8dcf1ee0..b5dbb1560b6e 100644 --- a/net/freeswitch-core/Makefile +++ b/net/freeswitch-core/Makefile @@ -61,8 +61,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-ogg-libraries=${LOCALBASE}/lib \ --with-ogg-includes=${LOCALBASE}/include -CONFIGURE_ENV+= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes CPPFLAGS+= -I${PREFIX}/include diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index 46aca3be188f..c8bee626ff8f 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -19,7 +19,7 @@ COMMENT= An enhanced Wide Area Information Server HAS_CONFIGURE= yes USE_PERL5_BUILD=yes CONFIGURE_SCRIPT= Configure -CONFIGURE_ENV= PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}" +CONFIGURE_ENV= PREFIX="${PREFIX}" CONFIGURE_ARGS= -sde -Dprefix="${PREFIX}" \ -Darchname="${MACHINE_ARCH}-freebsd" INSTALL_TARGET= install install.man diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile index 22054e319f66..50e3d875b176 100644 --- a/net/g2ipmsg/Makefile +++ b/net/g2ipmsg/Makefile @@ -26,7 +26,7 @@ USE_GSTREAMER= vorbis USE_ICONV= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --enable-systray --with-ssl=${OPENSSLBASE} GCONF_SCHEMAS= g2ipmsg.schemas diff --git a/net/gini/Makefile b/net/gini/Makefile index 1ac6c1a7ed7f..392c6fab5a4c 100644 --- a/net/gini/Makefile +++ b/net/gini/Makefile @@ -19,7 +19,8 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_GNOME= glib12 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes USERS= ${PORTNAME} GROUPS= ${USERS} diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index bc38988baf1e..05b7be98d09e 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -33,9 +33,9 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile index f6975cdcd15c..ff8f6c93ebce 100644 --- a/net/gnome-mud/Makefile +++ b/net/gnome-mud/Makefile @@ -22,8 +22,8 @@ USE_GSTREAMER= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes MAN6= gnome-mud.6 diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index 54dacf22cd79..de00c1619a4f 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -26,8 +26,8 @@ USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -DHAVE_SOCKADDR_SA_LEN post-install: diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile index c3ed3783e07f..485e8dd48d4d 100644 --- a/net/gnu-dico/Makefile +++ b/net/gnu-dico/Makefile @@ -22,8 +22,8 @@ USE_GMAKE= yes USE_AUTOTOOLS= libltdl libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var OPTIONS= PYTHON "With PYTHON support" on \ diff --git a/net/gq/Makefile b/net/gq/Makefile index 408dd88fa9db..4eca54b94f2b 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -26,11 +26,10 @@ USE_OPENLDAP= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile index 611a351cce3f..7b7c2c2c6a87 100644 --- a/net/grdesktop/Makefile +++ b/net/grdesktop/Makefile @@ -22,7 +22,8 @@ USE_GMAKE= yes USE_GNOME= libgnomeui gnomeprefix gnomehack GCONF_SCHEMAS= grdesktop.schemas INSTALLS_OMF= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps MAN1= grdesktop.1 diff --git a/net/grsync/Makefile b/net/grsync/Makefile index 36a8f916b9d1..9cd72e7a8cad 100644 --- a/net/grsync/Makefile +++ b/net/grsync/Makefile @@ -27,7 +27,6 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index 561b68970ead..3ba77388a57b 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -25,8 +25,8 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_PYTHON= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gtkglext=yes .include <bsd.port.mk> diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile index 1fdf88326a8b..b7ad7afeaa7e 100644 --- a/net/gutenfetch/Makefile +++ b/net/gutenfetch/Makefile @@ -16,8 +16,8 @@ COMMENT= Fetch listings and books from Project Gutenberg LIB_DEPENDS= gutenfetch:${PORTSDIR}/devel/libgutenfetch GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} USE_GMAKE= yes USE_BZIP2= yes diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile index 7423c5610a40..46d40a42a6b3 100644 --- a/net/hawknl-devel/Makefile +++ b/net/hawknl-devel/Makefile @@ -24,9 +24,8 @@ USE_GMAKE= yes MAKEFILE= makefile.linux USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/HawkNL1.70 diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile index 39716c46198f..8c9970bf149b 100644 --- a/net/hawknl/Makefile +++ b/net/hawknl/Makefile @@ -20,9 +20,8 @@ USE_GMAKE= yes MAKEFILE= makefile.linux USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -MAKE_ENV= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} diff --git a/net/howl/Makefile b/net/howl/Makefile index f39bd2da4bf6..43e015a78857 100644 --- a/net/howl/Makefile +++ b/net/howl/Makefile @@ -27,7 +27,6 @@ PLIST_SUB= VERSION="${PORTVERSION}" CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${PTHREAD_LIBS}" MAN8= mDNSResponder.8 diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile index 7b0dc4608253..bf65608c268d 100644 --- a/net/iaxmodem/Makefile +++ b/net/iaxmodem/Makefile @@ -18,9 +18,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff MAN1= iaxmodem.1 CFLAGS+= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -MAKE_ENV= LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message USE_RC_SUBR= iaxmodem diff --git a/net/iplog/Makefile b/net/iplog/Makefile index 9e0bbcd8dea1..dad105f907ac 100644 --- a/net/iplog/Makefile +++ b/net/iplog/Makefile @@ -16,9 +16,8 @@ COMMENT= TCP/IP traffic logging tool USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAN5= iplog.conf.5 MAN8= iplog.8 diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index dc47f9397358..1f417ccd5fa2 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -19,7 +19,8 @@ COMMENT=An improved WHOIS client capable of selecting server to query GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib" +CPPFLAGS+= -I${PREFIX}/include +LDFLAGS+= -L${PREFIX}/lib CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/jwhois .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 7b911afe561d..703660677170 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -35,7 +35,7 @@ DO_NOT_COMPILE+=kopete lanbrowsing filesharing CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE} .if defined(DO_NOT_COMPILE) -CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}" +CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" .endif # defined(DO_NOT_COMPILE) .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 84edb2e2cc25..5dafe9234ce5 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -26,7 +26,6 @@ USE_RC_SUBR= keepalived.sh LDFLAGS+= -lipvs -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-kernel-dir=${LOCALBASE} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" MAN1= genhash.1 MAN5= keepalived.conf.5 diff --git a/net/kphone/Makefile b/net/kphone/Makefile index 83709045531e..7727c59b0626 100644 --- a/net/kphone/Makefile +++ b/net/kphone/Makefile @@ -19,7 +19,7 @@ USE_QT_VER= 3 USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" +CFLAGS+= ${PTHREAD_CFLAGS} post-patch: @${REINPLACE_CMD} -e "s|-O3||g ; \ diff --git a/net/krdesktop/Makefile b/net/krdesktop/Makefile index 7f827c11e7a4..6bda0fb9389c 100644 --- a/net/krdesktop/Makefile +++ b/net/krdesktop/Makefile @@ -21,7 +21,7 @@ USE_KDELIBS_VER=3 NO_WRKSUBDIR= yes PLIST_FILES= bin/krdesktop -MAKE_ENV= QTDIR=${QT_PREFIX} \ +MAKE_ENV= QTDIR=${QT_PREFIX} \ KDEDIR=${LOCALBASE} \ MOC=${MOC} diff --git a/net/libfb/Makefile b/net/libfb/Makefile index 7f182e5b6f81..4c7d09ef32b7 100644 --- a/net/libfb/Makefile +++ b/net/libfb/Makefile @@ -16,9 +16,8 @@ COMMENT= A foneBRIDGE configuration library BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet GNU_CONFIGURE= yes -CONFIGURE_ENV=\ - CPPFLAGS="${LIBNET_CPPFLAGS}"\ - LDFLAGS="${LIBNET_LIBS:N-l*}" +CPPFLAGS+= ${LIBNET_CPPFLAGS} +LDFLAGS+= ${LIBNET_LIBS:N-l*} CONFIGURE_ARGS= --disable-shared LIBNET_CONFIG= ${LOCALBASE}/bin/libnet11-config diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile index d34f1592dda0..6eccc52d1247 100644 --- a/net/libgnetwork/Makefile +++ b/net/libgnetwork/Makefile @@ -22,8 +22,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gconf2 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib #.if !defined(WITHOUT_SSL) #LIB_DEPENDS+= gnutls.13:${PORTSDIR}/security/gnutls diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile index 8019b30f33ae..dc41f8af8d8f 100644 --- a/net/libgweather/Makefile +++ b/net/libgweather/Makefile @@ -24,8 +24,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gweather.schemas diff --git a/net/libmms/Makefile b/net/libmms/Makefile index 250417560c18..df92c4abc182 100644 --- a/net/libmms/Makefile +++ b/net/libmms/Makefile @@ -18,7 +18,7 @@ USE_GETTEXT= yes USE_ICONV= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index cdead4c93463..56543f86564b 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -118,7 +118,6 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --without-dag .else LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif .if defined(LIBPCAP_OVERWRITE_BASE) diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 1d9bc62454af..6c5643091d55 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes USE_CSTD= gnu89 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-shared --disable-trace USE_LDCONFIG= yes diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile index 1ca8dd34ca67..2beff7ed485b 100644 --- a/net/libtrace/Makefile +++ b/net/libtrace/Makefile @@ -25,7 +25,7 @@ MAN1= traceanon.1 traceconvert.1 tracefilter.1 tracemerge.1 tracepktdump.1 \ tracereport.1 tracertstats.1 tracesplit.1 tracesplit_dir.1 tracestats.1 \ tracesummary.1 -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index f1e322db02dd..1c9b7080e391 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg USE_GNOME= gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --without-x OPTIONS= GNUTLS "Adds GnuTLS support" Off \ diff --git a/net/liferea/Makefile b/net/liferea/Makefile index b596d8608ece..920ca02a151b 100644 --- a/net/liferea/Makefile +++ b/net/liferea/Makefile @@ -20,8 +20,8 @@ USE_GNOME= gnomeprefix gnomehack libglade2 gconf2 USE_GMAKE= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-libnotify MAKE_JOBS_SAFE= yes diff --git a/net/linc/Makefile b/net/linc/Makefile index b18c91bc98b7..bd339495df59 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -25,8 +25,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/ s|docs||' ${WRKSRC}/Makefile.in diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile index c735a8bbd528..660920bdba03 100644 --- a/net/link-monitor-applet/Makefile +++ b/net/link-monitor-applet/Makefile @@ -20,7 +20,8 @@ LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP USE_GNOME= gnomehack gnomeprefix gnomepanel eel2 librsvg2 libgnomeui GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= link-monitor-applet.schemas INSTALLS_OMF= yes diff --git a/net/linneighborhood/Makefile b/net/linneighborhood/Makefile index 5cf264462eeb..dd04466c99c4 100644 --- a/net/linneighborhood/Makefile +++ b/net/linneighborhood/Makefile @@ -22,11 +22,11 @@ GNU_CONFIGURE= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gtk12 -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"\ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ - CC="${CC} -I${LOCALBASE}/include" +CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" # ^ # this was done intentionaly in order to make `configure' pick up libintl.h +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= ${PTHREAD_CFLAGS} .include <bsd.port.pre.mk> diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile index 879d21617985..9399a804d524 100644 --- a/net/linphone-base/Makefile +++ b/net/linphone-base/Makefile @@ -25,15 +25,14 @@ USE_GNOME= glib20 gnomehack intlhack pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-ipv6 --disable-manual --disable-ewarning \ --disable-strict --disable-video --disable-external-ortp \ --with-osip=${LOCALBASE} --with-gsm=${LOCALBASE} MAKE_ENV= SUBDIRS="${SUBDIRS}" USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index 4393b3a2d229..89260c12e0d0 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -23,9 +23,7 @@ CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-search="${LOCALBASE}" \ --disable-inotify CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CFLAGS="${CFLAGS}" + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" USE_RC_SUBR= mediatomb.sh # --- configurable variables --- diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile index 7bc99f114a28..83e4d1cedae5 100644 --- a/net/minisapserver/Makefile +++ b/net/minisapserver/Makefile @@ -25,7 +25,7 @@ SUB_FILES= pkg-message OPTIONS= SLP "Enable SLP support via openslp" off CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> diff --git a/net/miredo/Makefile b/net/miredo/Makefile index 17492a7682b5..ceef854f7d43 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -28,7 +28,7 @@ MAN5= miredo-server.conf.5 miredo.conf.5 MAN8= miredo-server.8 miredo.8 miredo-checkconf.8 USE_RC_SUBR= miredo_server miredo -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile index 59dba10ba8f8..7890c8e2bde7 100644 --- a/net/mpich2/Makefile +++ b/net/mpich2/Makefile @@ -46,9 +46,10 @@ USE_GNOME= pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-romio --enable-shared \ --docdir=${DOCSDIR} -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}" \ +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PACKAGE=${PORTNAME} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS} FFLAGS?= -O2 NOCCACHE= yes MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} diff --git a/net/nc6/Makefile b/net/nc6/Makefile index db172caf3648..12a079a118c5 100644 --- a/net/nc6/Makefile +++ b/net/nc6/Makefile @@ -18,8 +18,8 @@ COMMENT= Netcat clone with IPv6 support MAN1= nc6.1 USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/net/net6/Makefile b/net/net6/Makefile index b9c8e8b584ee..80bf9b737ef2 100644 --- a/net/net6/Makefile +++ b/net/net6/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ USE_GNOME= gnomehack pkgconfig USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes @@ -30,8 +29,8 @@ PLIST_SUB+= NLS="@comment " .else USE_GETTEXT= yes PLIST_SUB+= NLS="" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif .include <bsd.port.mk> diff --git a/net/netboot/Makefile b/net/netboot/Makefile index b6c650fcc92d..07c0a3e1a3ee 100644 --- a/net/netboot/Makefile +++ b/net/netboot/Makefile @@ -23,8 +23,8 @@ USE_LDCONFIG= yes USE_BISON= build CONFIGURE_ARGS+= --enable-static=no --enable-bootrom=yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LIBS="${LIBS} -L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="${LIBS} -L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include MAN5= netboot.5 netboot.config.5 netboot.drivers.5 netboot.db.5 MAN8= mknbi-mgl.8 makerom.8 mknbi-dos.8 mknbi-linux.8 nbdbtool.8 diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile index bd606d7c622f..445d15fe3cf1 100644 --- a/net/netspeed_applet/Makefile +++ b/net/netspeed_applet/Makefile @@ -21,7 +21,7 @@ USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile index 1aec3edcc5de..0fdef46f24c1 100644 --- a/net/nss-pam-ldapd/Makefile +++ b/net/nss-pam-ldapd/Makefile @@ -41,8 +41,8 @@ IGNORE= problems with nss/libc TLS EXTRA_PATCHES+= ${FILESDIR}/rtld_nss__nslcd.c .endif -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-nslcd-pidfile=${NSLCD_PIDFILE} \ --with-nslcd-socket=${NSLCD_SOCKET} \ diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile index 716bac5bd20a..306c16b4d9d0 100644 --- a/net/nss_ldap/Makefile +++ b/net/nss_ldap/Makefile @@ -28,8 +28,8 @@ USE_OPENLDAP= yes OPTIONS= LCLASS "Enable login classes via the loginClass attribute" on -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib CONFIGURE_ARGS= --with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \ --with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \ diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 78298e68c87f..58dfbd71246c 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -80,10 +80,10 @@ CONFIGURE_ARGS+= --enable-i18n \ .if defined(WITH_XMLDUMP) LIB_DEPENDS+= gdome.8:${PORTSDIR}/textproc/gdome2 -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \ +CPPFLAGS+= -I${LOCALBASE}/include/libxml2 \ -I${LOCALBASE}/include/libxml2/libxml \ -I${LOCALBASE}/include/libgdome \ - -I${LOCALBASE}/include/glib-2.0" + -I${LOCALBASE}/include/glib-2.0 .endif .if ${OSVERSION} < 700000 diff --git a/net/opal/Makefile b/net/opal/Makefile index 425de0d60a35..378cf146967a 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -29,8 +29,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_ARGS= -j`${SYSCTL} -n hw.ncpu` -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= PORTVERSION=${PORTVERSION} .include <bsd.port.pre.mk> diff --git a/net/opal3/Makefile b/net/opal3/Makefile index 3ec899cc98ef..d57c9442e402 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -30,8 +30,8 @@ USE_LDCONFIG= yes #MAKE_JOBS_SAFE= yes CXXFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= ZRTP "Enable ZRTP protocol support" off \ JAVA "Enable Java JNI support" off \ diff --git a/net/openh323/Makefile b/net/openh323/Makefile index fa860d159c2e..7add8bff782a 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -28,8 +28,9 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes ALL_TARGET= optshared -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES" +CONFIGURE_ENV+= BUILDTIME="YES" +CPPFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= BUILDTIME="YES" .include <bsd.port.pre.mk> diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index 6c333211a927..2df83f34da03 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -379,9 +379,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ LDFLAGS+= -L${LOCALBASE}/lib #LIBS+= ${PTHREAD_LIBS} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LIBS="${LIBS}" +CONFIGURE_ENV+= LIBS="${LIBS}" .if defined(CLIENT_ONLY) .include "${FILESDIR}/manpages" diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index e8e60fb368e2..c1f63f58c8d0 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -452,9 +452,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ LDFLAGS+= -L${LOCALBASE}/lib #LIBS+= ${PTHREAD_LIBS} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LIBS="${LIBS}" +CONFIGURE_ENV+= LIBS="${LIBS}" .if defined(CLIENT_ONLY) .include "${FILESDIR}/manpages" diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile index 1239cfbcea90..9b47d0aa5b74 100644 --- a/net/panoptis/Makefile +++ b/net/panoptis/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= ccgnu2-1.7.0:${PORTSDIR}/devel/commoncpp GNU_CONFIGURE= yes USE_PYTHON= yes -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}' PLIST_FILES= bin/panoptis bin/mail.py bin/pview.py bin/speed.py do-install: diff --git a/net/pktanon/Makefile b/net/pktanon/Makefile index 6a5bc80f4097..a3434f320b87 100644 --- a/net/pktanon/Makefile +++ b/net/pktanon/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \ xerces-c:${PORTSDIR}/textproc/xerces-c2 GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes post-install: diff --git a/net/poptop/Makefile b/net/poptop/Makefile index 92271dc27afa..952a719d7fb8 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -19,7 +19,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" -MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" USE_RC_SUBR= pptpd.sh diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile index 397c0ff4486d..68bad075dc7a 100644 --- a/net/proxy-suite/Makefile +++ b/net/proxy-suite/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes # # basic configure args # -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --prefix=${PREFIX} --with-libwrap=/usr/lib --with-regex \ --localstatedir=/var/run \ --enable-warnings --enable-so-linger \ diff --git a/net/quagga/Makefile b/net/quagga/Makefile index e5289651bf31..15725ec05ce5 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -50,9 +50,9 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -fstack-protector .endif CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ +CONFIGURE_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(ENABLE_USER) ENABLE_USER=quagga diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile index 2f5219cc2c76..3d670ccb1eab 100644 --- a/net/rabbitmq-c-devel/Makefile +++ b/net/rabbitmq-c-devel/Makefile @@ -53,8 +53,6 @@ CONFIGURE_ARGS+= --enable-64-bit LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" PLIST_SUB+= POPT='' CONFIGURE_ARGS+= --with-popt diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile index a06f274b075f..41d84458b26f 100644 --- a/net/rabbitmq-c/Makefile +++ b/net/rabbitmq-c/Makefile @@ -52,8 +52,6 @@ CONFIGURE_ARGS+= --enable-64-bit LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" PLIST_SUB+= POPT='' CONFIGURE_ARGS+= --with-popt diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile index 4059c203e865..7513a3e8c664 100644 --- a/net/remmina-applet/Makefile +++ b/net/remmina-applet/Makefile @@ -23,8 +23,8 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 gtk20 gnomepanel -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk index b3bddae93615..6aa1b7e77816 100644 --- a/net/remmina-plugins/bsd.plugin.mk +++ b/net/remmina-plugins/bsd.plugin.mk @@ -14,8 +14,7 @@ USE_GMAKE= yes USE_GNOME= glib20 gtk20 INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFIGURE_ARGS+=--disable-nx --disable-rdp --disable-ssh --disable-telepathy \ --disable-vnc --disable-xdmcp --disable-nls diff --git a/net/remmina/Makefile b/net/remmina/Makefile index d3a9399e3ada..211fd8cdf79e 100644 --- a/net/remmina/Makefile +++ b/net/remmina/Makefile @@ -25,8 +25,7 @@ USE_GMAKE= yes USE_GNOME= glib20 gtk20 desktopfileutils INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} SUB_FILES= pkg-message LICENSE= GPLv2 diff --git a/net/rexx-sock/Makefile b/net/rexx-sock/Makefile index 6d5ea8e7c49c..aad8c2cea901 100644 --- a/net/rexx-sock/Makefile +++ b/net/rexx-sock/Makefile @@ -21,7 +21,8 @@ RUN_DEPENDS= rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-rexx=regina MAKE_ARGS= INSTALL="${INSTALL}" USE_LDCONFIG= yes diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 04b22c4b7d9c..d6f0302bf6f2 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -75,7 +75,7 @@ CFLAGS+= -I${LOCALBASE}/include USE_ICONV= yes CONFIGUREDCFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}" +CONFIGURE_ENV+= CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}" .else CONFIGURE_ARGS+= --disable-iconv CONFIGURE_ENV+= ac_cv_search_libiconv_open=no @@ -94,8 +94,8 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff .if defined(WITH_POPT_PORT) LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include .else CONFIGURE_ARGS+= --with-included-popt .endif diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile index 8e88a5f73760..1eff737b8214 100644 --- a/net/rtpproxy/Makefile +++ b/net/rtpproxy/Makefile @@ -16,8 +16,8 @@ COMMENT= A high-performance RTP proxy server for the SIP Express Router (SER) LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ - LIBS=-L${LOCALBASE}/lib +CONFIGURE_ENV+= LIBS=-L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include #CONFIGURE_ARGS= --mandir=${LOCALBASE}/man MAN8= rtpproxy.8 diff --git a/net/samba34/Makefile b/net/samba34/Makefile index e1d1915cf87f..7cbcfe437e22 100644 --- a/net/samba34/Makefile +++ b/net/samba34/Makefile @@ -68,7 +68,6 @@ CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" # pkg-config is used to find talloc PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||} diff --git a/net/samba35/Makefile b/net/samba35/Makefile index 2c89c9ad16ef..cac62b4a4e26 100644 --- a/net/samba35/Makefile +++ b/net/samba35/Makefile @@ -74,8 +74,7 @@ CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" # pkg-config is used to find talloc, tevent and tdb PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig diff --git a/net/samba4-devel/Makefile b/net/samba4-devel/Makefile index 9ddd6e2ef8fe..49fb7067a579 100644 --- a/net/samba4-devel/Makefile +++ b/net/samba4-devel/Makefile @@ -43,7 +43,6 @@ USE_AUTOTOOLS= autoconf autoheader # Flags CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" # Directories VARDIR= /var SAMBA_LOGDIR= ${VARDIR}/log/${PORTNAME} diff --git a/net/ser/Makefile b/net/ser/Makefile index d1341c28d9b1..1b32bfc76240 100644 --- a/net/ser/Makefile +++ b/net/ser/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GMAKE= yes USE_RC_SUBR= ser CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= "LDFLAGS=-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib NOPRECIOUSMAKEVARS= yes diff --git a/net/serveez/Makefile b/net/serveez/Makefile index a572f4f2e838..a3207eeb93f9 100644 --- a/net/serveez/Makefile +++ b/net/serveez/Makefile @@ -22,14 +22,13 @@ GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes MAN1= serveez.1 serveez-config.1 INFO= serveez serveez-api -CPPFLAGS= `${GUILE_CONFIG} compile` -LDFLAGS= `${GUILE_CONFIG} link` +CPPFLAGS+= `${GUILE_CONFIG} compile` +LDFLAGS+= `${GUILE_CONFIG} link` post-patch: @${REINPLACE_CMD} -e 's|-release||g' \ diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index 111649012983..70034acad481 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -115,7 +115,7 @@ CONFIGURE_ARGS+= --disable-asm .endif .if defined(WITH_PTHREADS) -CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} .else CONFIGURE_ARGS+= --without-pthreads .endif diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile index f914a9d5811f..bcb5c3ff682d 100644 --- a/net/silc-server/Makefile +++ b/net/silc-server/Makefile @@ -30,7 +30,7 @@ USE_RC_SUBR= silcd USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" +CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \ --sysconfdir=${PREFIX}/etc/${PORTNAME} \ --with-helpdir=share/${PORTNAME}/help \ diff --git a/net/sobby/Makefile b/net/sobby/Makefile index dd072e15a4f7..b9c0401ea5cf 100644 --- a/net/sobby/Makefile +++ b/net/sobby/Makefile @@ -21,15 +21,14 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ glibmm-2.4.1:${PORTSDIR}/devel/glibmm GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-zeroconf MAKE_JOBS_SAFE= yes MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile index f6b7356fd632..0287e18b3986 100644 --- a/net/tapidbus/Makefile +++ b/net/tapidbus/Makefile @@ -23,7 +23,6 @@ USE_GNOME= pkgconfig glib20 gnomehack USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV+= LDFLAGS="${LDFLAGS}" post-patch: @${REINPLACE_CMD} -e 's|\-O2||' ${WRKSRC}/configure diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile index 7a37b626366b..8b38f9238143 100644 --- a/net/tintin++/Makefile +++ b/net/tintin++/Makefile @@ -23,7 +23,7 @@ OPTIONS= BIG5 "Big5 support" off CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \ --libdir=${LOCALBASE}/lib \ --prefix=${PREFIX} -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" ac_cv_file__dev_ptmx=no +CONFIGURE_ENV= ac_cv_file__dev_ptmx=no GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} USE_GMAKE= yes diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile index 5d45de2b2804..4add1a9d04c6 100644 --- a/net/trafshow3/Makefile +++ b/net/trafshow3/Makefile @@ -27,7 +27,8 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include ALL_TARGET= trafshow MAN1= trafshow.1 diff --git a/net/trickle/Makefile b/net/trickle/Makefile index 9febe86c06ec..911c88cb444d 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -22,8 +22,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} \ --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAN1= trickle.1 MAN5= trickled.conf.5 diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile index d97277d058cc..678c8895f35b 100644 --- a/net/tridiavnc/Makefile +++ b/net/tridiavnc/Makefile @@ -29,7 +29,7 @@ CONFLICTS= tightvnc-[0-9]* vnc-[0-9]* .ifdef(TRIDIAVNC_BASE) PREFIX=${TRIDIAVNC_BASE} -MAKE_ENV+= DESTDIR=${TRIDIAVNC_BASE} +MAKE_ENV+= DESTDIR=${TRIDIAVNC_BASE} .endif .include <bsd.port.pre.mk> diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 4d18f65ed1da..c82696ed78b2 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -21,9 +21,9 @@ USE_GNOME= gtk20 USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="`pkg-config --libs libgnomeui-2.0`" +CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" +CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` +LDFLAGS+= -L${LOCALBASE}/lib MAN1= tsclient.1 PORTDOCS= COPYING NEWS README diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile index 22a10a1a30d1..c8c048c1c629 100644 --- a/net/twinkle/Makefile +++ b/net/twinkle/Makefile @@ -35,8 +35,7 @@ USE_QT_VER= 3 OPTIONS= KDE "Compile with kde features" off CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE} \ -CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ - CFLAGS="${CFLAGS}" +CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" MAKE_ENV= QTDIR=${QT_PREFIX} SUB_FILES= pkg-message diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile index b43d0626903e..f0c7b5b28227 100644 --- a/net/ulxmlrpcpp/Makefile +++ b/net/ulxmlrpcpp/Makefile @@ -24,13 +24,12 @@ USE_GNOME= gnomehack USE_ICONV= yes USE_OPENSSL= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/net/uplog/Makefile b/net/uplog/Makefile index 0a7833146212..13ab97b2b21d 100644 --- a/net/uplog/Makefile +++ b/net/uplog/Makefile @@ -14,8 +14,8 @@ MAINTAINER= jadawin@FreeBSD.org COMMENT= UDP-based ping programm GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include PORTDOCS= README PLIST_FILES= bin/uplog diff --git a/net/ushare/Makefile b/net/ushare/Makefile index 6d21053103ba..8ced4eadac9a 100644 --- a/net/ushare/Makefile +++ b/net/ushare/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= pkgconfig USE_GETTEXT= yes -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" +LDFLAGS+= -L${LOCALBASE}/lib -lintl CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC} diff --git a/net/vde/Makefile b/net/vde/Makefile index cff10a11bb51..577442e8216f 100644 --- a/net/vde/Makefile +++ b/net/vde/Makefile @@ -22,7 +22,6 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> CFLAGS+= ${CPPFLAGS} -fPIC -MAKE_ENV+= LDFLAGS="${LDFLAGS}" MAN1= dpipe.1 slirpvde.1 vdetaplib.1 vdeq.1 vde_plug.1 vde_switch.1 diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 1db7e8850b67..5cd9562bb118 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -32,7 +32,7 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-avahi --enable-applet -enable-ssh CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= vinagre.schemas diff --git a/net/vino/Makefile b/net/vino/Makefile index c4d2501f1abc..1c5d00877124 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -28,8 +28,8 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= vino-server.schemas diff --git a/net/whois/Makefile b/net/whois/Makefile index d666632ab5a6..dde738952271 100644 --- a/net/whois/Makefile +++ b/net/whois/Makefile @@ -23,7 +23,6 @@ USE_PERL5_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_ENV= LDFLAGS="${LDFLAGS}" MAKE_ARGS= OPTS="" MAN1= mwhois.1 mkpasswd.1 diff --git a/net/wire/Makefile b/net/wire/Makefile index 782845f4a74c..bdde35a17e7d 100644 --- a/net/wire/Makefile +++ b/net/wire/Makefile @@ -18,9 +18,8 @@ COMMENT= Wire is a screen-oriented command line Wired client GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include" -MAKE_ENV= CPPFLAGS=${CPPFLAGS} USE_GMAKE= yes USE_OPENSSL= yes diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile index 3c5958a10ce6..c33e64bf32df 100644 --- a/net/wmwifi/Makefile +++ b/net/wmwifi/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_XORG= x11 xpm USE_GMAKE= yes -CONFIGURE_ENV+= "CPPFLAGS=-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include PLIST_FILES= bin/wmwifi diff --git a/net/wol/Makefile b/net/wol/Makefile index 5c4672d93014..873810d3bf89 100644 --- a/net/wol/Makefile +++ b/net/wol/Makefile @@ -17,9 +17,8 @@ COMMENT= Tool to wake up Wake-On-LAN compliant computers GNU_CONFIGURE= yes USE_PERL5_BUILD= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS= --disable-nls diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 20485d2ae9ba..2cd3d991d1ca 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -31,7 +31,7 @@ USE_ICONV= yes USE_GETTEXT= yes .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include MAN1= x11vnc.1 PORTDOCS= AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index 1e18be7bad76..79e60992d2b8 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 USE_XORG= xt x11 ice xaw xmu GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="`${LIBNET_CONFIG} --libs`" +LDFLAGS+= `${LIBNET_CONFIG} --libs` CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \ -I/usr/include diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile index 59f3fdd4798c..8ec3577efc58 100644 --- a/net/xmlrpc-epi/Makefile +++ b/net/xmlrpc-epi/Makefile @@ -19,8 +19,8 @@ USE_GMAKE= yes USE_ICONV= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv CONFIGURE_ARGS= --program-transform="s|^|xre-|" PORTDOCS= AUTHORS ChangeLog NEWS README diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index e3714517bb69..2f49486472ba 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -25,9 +25,8 @@ GNU_CONFIGURE= yes USE_RC_SUBR= xrdp CONFIGURE_ARGS= --localstatedir=/var -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile index fae2c8dc2601..495e68b526a5 100644 --- a/net/yate-devel/Makefile +++ b/net/yate-devel/Makefile @@ -31,8 +31,8 @@ WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-fdsize \ --mandir=${LOCALBASE}/man -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ diff --git a/net/yate/Makefile b/net/yate/Makefile index cdf984f78b04..9bc4fb4e3c38 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -30,14 +30,14 @@ WRKSRC= ${WRKDIR}/yate CONFIGURE_ARGS= --without-fdsize \ --with-zlib=/usr -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} \ + OSVERSION=${OSVERSION} MAN8= yate-config.8 yate.8 |