diff options
Diffstat (limited to 'www')
75 files changed, 107 insertions, 160 deletions
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 71f1ca2..f673fce 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -140,8 +140,8 @@ CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}' .if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT) CONFIGURE_ENV+= \ - INCLUDES=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib + INCLUDES=-I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif MAN1= dbmmanage.1 htdigest.1 htpasswd.1 diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index 51de570..3e0fef8 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -122,7 +122,7 @@ OPTIM+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CFLAGS= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}' \ +CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}' MAN1= dbmmanage.1 htdigest.1 htpasswd.1 diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index cea4e55..737d451 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -293,9 +293,7 @@ EXTRA_PATCHES+= ${FILESDIR}/logresolve.c.patch EXTRA_PATCHES+= ${FILESDIR}/rotatelogs.c.patch .endif -CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ - LDFLAGS='${LDFLAGS}' \ - OPTIM='${OPTIM}' \ +CONFIGURE_ENV= OPTIM='${OPTIM}' \ SSL_BASE='${OPENSSLBASE}' \ EAPI_MM='SYSTEM' \ PATH="${PREFIX}/bin:${PATH}" diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 33d0d42..dead6cc 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -141,8 +141,8 @@ CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}' .if !defined(WITHOUT_APACHE_EXPAT) && !defined(WITH_APACHE_INTERNAL_EXPAT) CONFIGURE_ENV+= \ - INCLUDES=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib + INCLUDES=-I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif MAN1= dbmmanage.1 htdigest.1 htpasswd.1 diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 8d91124..19616ae 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -84,9 +84,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --includedir=${PREFIX_RELDEST}/include/apache2 CONFIGURE_ENV= \ - CC="${CC}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 379d94b..6fdea35 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -82,10 +82,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --with-apr=${LOCALBASE}/bin/apr-1-config \ --with-apr-util=${LOCALBASE}/bin/apu-1-config -CONFIGURE_ENV= \ - CC="${CC}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV= \ CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" diff --git a/www/aria/Makefile b/www/aria/Makefile index 92d2106..717857e 100644 --- a/www/aria/Makefile +++ b/www/aria/Makefile @@ -28,11 +28,10 @@ USE_GNOME= gtk12 USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PORTDOCS= README README.euc -CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS+= -L${LOCALBASE}/lib post-extract: @${RM} -f ${WRKSRC}/src/getopt* diff --git a/www/awffull/Makefile b/www/awffull/Makefile index 07330bd..bffe79a 100644 --- a/www/awffull/Makefile +++ b/www/awffull/Makefile @@ -34,10 +34,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \ --with-font-label=${FONTLABEL} \ --with-etcdir=${PREFIX}/etc -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= awffull.1 MAN5= awffull.conf.5 diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile index e28b472..004320a 100644 --- a/www/bluefish-devel/Makefile +++ b/www/bluefish-devel/Makefile @@ -37,8 +37,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-freedesktop_org-menu=${PREFIX}/share/applications \ --with-freedesktop_org-mime=${PREFIX}/share/mime \ --without-gnome2_4-mime \ diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 2a9ff73..19057cf 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -26,8 +26,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-freedesktop_org-menu=${PREFIX}/share/applications \ --with-freedesktop_org-mime=${PREFIX}/share/mime \ --without-gnome2_4-mime \ diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 7a01af8..3d68b34 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -51,8 +51,8 @@ CONFIGURE_ARGS+= --without-perl LIB_DEPENDS+= clamav.7:${PORTSDIR}/security/clamav PLIST_SUB+= CLAMAV="" CONFIGURE_ARGS+= --with-clamav -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include .else PLIST_SUB+= CLAMAV="@comment " CONFIGURE_ARGS+= --without-clamav diff --git a/www/cacheboy15-devel/Makefile b/www/cacheboy15-devel/Makefile index 394bcf8..7dd334d 100644 --- a/www/cacheboy15-devel/Makefile +++ b/www/cacheboy15-devel/Makefile @@ -350,10 +350,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}"\ - LDFLAGS="${LDFLAGS}" - PLIST_DIRS= etc/squid/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} diff --git a/www/cacheboy16/Makefile b/www/cacheboy16/Makefile index 0707b0e..c36d49f 100644 --- a/www/cacheboy16/Makefile +++ b/www/cacheboy16/Makefile @@ -353,10 +353,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}"\ - LDFLAGS="${LDFLAGS}" - PLIST_DIRS= etc/squid/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 82a94e2..8ab9836 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -18,7 +18,6 @@ COMMENT= Commandline client for DAV LIB_DEPENDS= neon:${PORTSDIR}/www/neon29 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-netrc ALL_TARGET= cadaver MAKE_JOBS_SAFE= yes @@ -37,8 +36,8 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - \ --exclude 'glob.[ch]' --exclude 'mkstemp.[ch]' \ --exclude 'tempname.[ch]' --exclude 'basename.[ch]' -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if !defined(WITHOUT_OPENSSL) USE_OPENSSL= yes diff --git a/www/castget/Makefile b/www/castget/Makefile index 8f67dc5..2b380d1 100644 --- a/www/castget/Makefile +++ b/www/castget/Makefile @@ -21,7 +21,6 @@ USE_LDCONFIG= yes USE_GNOME= glib20 libxml2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-static GNU_CONFIGURE= yes diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index df8dc7b..0638364 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -55,9 +55,8 @@ USE_RC_SUBR= cherokee.sh SUB_FILES= pkg-install pkg-message USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CHEROKEE_VARDIR?= /var CHEROKEE_LOGDIR?= ${CHEROKEE_VARDIR}/log diff --git a/www/cssed/Makefile b/www/cssed/Makefile index 70fa821..3c5b755 100644 --- a/www/cssed/Makefile +++ b/www/cssed/Makefile @@ -17,8 +17,8 @@ COMMENT= An application to help CSS style sheets creation and maintenance USE_GNOME= gnomehack gtk20 libxml2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-plugin-headers MAN1= cssed.1 diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile index 357dece..cb0ab19 100644 --- a/www/dillo-i18n/Makefile +++ b/www/dillo-i18n/Makefile @@ -39,8 +39,6 @@ USE_ICONV= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-cookies --enable-threaded-dns \ --libdir=${PREFIX}/libexec diff --git a/www/dillo/Makefile b/www/dillo/Makefile index d40967b..7ae3d16 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -28,8 +28,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-cookies --enable-threaded-dns \ --libdir=${PREFIX}/libexec .if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6) diff --git a/www/elinks/Makefile b/www/elinks/Makefile index b472c60..4c175ce 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -80,7 +80,6 @@ USE_LUA= 5.0 CONFIGURE_ARGS+= --with-lua CPPFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} -CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}" .else CONFIGURE_ARGS+= --without-lua .endif diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 76960b12..0a56616 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -27,8 +27,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} EPHY_EXTENSIONS=really-all EPHY_VERSION= ${PORTVERSION:R} diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 82eff47..6893b5b 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -41,8 +41,8 @@ USE_GMAKE= yes INSTALLS_OMF= yes CONFIGURE_ARGS+=--enable-introspection \ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS} GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 05f7fd3..7cd5dfd 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -22,8 +22,8 @@ USE_GETTEXT= yes USE_PERL5= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= evolution-webcal.schemas diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile index a806715..c3a5c92 100644 --- a/www/ffproxy/Makefile +++ b/www/ffproxy/Makefile @@ -16,8 +16,8 @@ COMMENT= Filtering HTTP proxy server BROKEN= does not fetch GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAN5= ${PORTNAME}.conf.5 MAN7= ${PORTNAME}.quick.7 diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile index 6214b17..64d7f3a 100644 --- a/www/flashplugin-mozilla/Makefile +++ b/www/flashplugin-mozilla/Makefile @@ -28,8 +28,8 @@ USE_XORG= xt x11 xext USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-plugin-dir="${WEBPLUGINS_DIR}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lXt" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lXt CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} USE_WEBPLUGINS= native diff --git a/www/flood/Makefile b/www/flood/Makefile index 2edc2cc..9b18c75 100644 --- a/www/flood/Makefile +++ b/www/flood/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= autoconf libtool:env CONFIGURE_ARGS= --disable-shared \ --with-apr=${LOCALBASE}/bin/apr-1-config \ --with-apr-util=${LOCALBASE}/bin/apu-1-config -CONFIGURE_ENV= LDFLAGS="-L${PREFIX}/lib" +LDFLAGS+= -L${PREFIX}/lib USE_GMAKE= yes USE_ICONV= yes diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile index b5f6770..23c1762 100644 --- a/www/gecko-mediaplayer/Makefile +++ b/www/gecko-mediaplayer/Makefile @@ -26,8 +26,8 @@ USE_GECKO= libxul USE_WEBPLUGINS= native WEBPLUGINS_FILES= ${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \ ${PORTNAME}-wmp.so ${PORTNAME}.so -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-plugin_dir="${WEBPLUGINS_DIR}" PORTDOCS= README COPYING AUTHORS ChangeLog INSTALL NEWS javascript.txt diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index ebd00c7..8a73017 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= desktop_gnome_file_sharing.schemas diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile index fda516d..97a9f10 100644 --- a/www/gnome-web-photo/Makefile +++ b/www/gnome-web-photo/Makefile @@ -25,14 +25,13 @@ USE_GNOME= gconf2 gnomehack gnomeprefix USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-silent-rules \ --with-gtk=2.0 GCONF_SCHEMAS= thumbnailer.schemas -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 8bb25d5..4a8c99e 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -32,8 +32,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="3.14" diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile index 6933971..c9b6d45 100644 --- a/www/gurlchecker/Makefile +++ b/www/gurlchecker/Makefile @@ -25,8 +25,8 @@ OPTIONS= CROCO "Use CROCO library for CSS2 validation" off \ USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index e4d9603..ef11b7c 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -27,10 +27,9 @@ WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var webrootdir=${WWWDIR} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= COMMAND "Enable the Hiawatha CommandChannel" Off \ CACHE "Internal file caching support" On \ diff --git a/www/hydra/Makefile b/www/hydra/Makefile index cc13b80..713edec 100644 --- a/www/hydra/Makefile +++ b/www/hydra/Makefile @@ -22,10 +22,9 @@ USE_RC_SUBR= hydra.sh NO_LATEST_LINK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LOGDIR?= /var/log/hydra diff --git a/www/kannel/Makefile b/www/kannel/Makefile index 220c5f3..1d784c3 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -36,8 +36,8 @@ OPTIONS= MYSQL "Enable MySQL support" off \ .include <bsd.port.options.mk> -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if defined(WITH_MYSQL) USE_MYSQL= yes diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index fdb7190..c51b11b 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -28,9 +28,9 @@ USE_GECKO= libxul USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gecko_engine=${GECKO} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ - -I${LOCALBASE}/include/nspr" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} \ + -I${LOCALBASE}/include/nspr MAN1= kazehakase.1 OPTIONS= WEBKIT "Webkit Backend (along with Gecko)" On diff --git a/www/libepc/Makefile b/www/libepc/Makefile index d448981..cb5f18d 100644 --- a/www/libepc/Makefile +++ b/www/libepc/Makefile @@ -24,8 +24,8 @@ USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack gtk20 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 0c619cb..7a48d2e 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 003adae..91139ec 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -37,8 +37,6 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd --enable-static CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" - .if !defined(_BUILDING_LIGHTTPD_MODULE) USE_RC_SUBR= lighttpd.sh diff --git a/www/links/Makefile b/www/links/Makefile index 0aed617..59de9a2 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -25,7 +25,7 @@ CONFLICTS= links-0* GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl --without-pmshell --without-atheos \ --without-gpm --without-fb -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_OPENSSL= yes diff --git a/www/lusca-head/Makefile b/www/lusca-head/Makefile index 3f30c86..ec3d08a 100644 --- a/www/lusca-head/Makefile +++ b/www/lusca-head/Makefile @@ -346,10 +346,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}"\ - LDFLAGS="${LDFLAGS}" - PLIST_DIRS= etc/squid/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} diff --git a/www/middleman/Makefile b/www/middleman/Makefile index c305127..03b88fd 100644 --- a/www/middleman/Makefile +++ b/www/middleman/Makefile @@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAN8= mman.8 diff --git a/www/midori/Makefile b/www/midori/Makefile index 010dcd44..3dc7903 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -26,8 +26,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-libnotify \ --enable-addons \ --enable-docs \ diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile index 673d170..d071dd0 100644 --- a/www/mod_clamav/Makefile +++ b/www/mod_clamav/Makefile @@ -40,8 +40,6 @@ CPPFLAGS+= -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib \ ${PTHREAD_LIBS} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" post-patch: @${REINPLACE_CMD} -e 's,REG_EXTENDED,AP_REG_EXTENDED,' \ diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile index 7181bb1..b0994be 100644 --- a/www/mod_dnssd/Makefile +++ b/www/mod_dnssd/Makefile @@ -22,10 +22,10 @@ MAKE_JOBS_SAFE= yes USE_GMAKE= yes USE_APACHE= 22+ GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \ +CONFIGURE_ENV= APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \ APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-lynx post-install: diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile index 1a6665b..3b2f845 100644 --- a/www/mod_encoding/Makefile +++ b/www/mod_encoding/Makefile @@ -36,9 +36,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --includedir=${APACHEINCLUDEDIR} \ --with-apxs=${APXS} -CONFIGURE_ENV= CPPFLAGS='-I${APACHEINCLUDEDIR} -I${LOCALBASE}/include' \ - LIBS='-L${LOCALBASE}/lib' \ +CONFIGURE_ENV= LIBS='-L${LOCALBASE}/lib' \ PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}" +CPPFLAGS+= -I${APACHEINCLUDEDIR} -I${LOCALBASE}/include PLIST_FILES= ${APACHEMODDIR}/mod_encoding.so diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile index f9a2efc..530efe0 100644 --- a/www/mod_musicindex/Makefile +++ b/www/mod_musicindex/Makefile @@ -31,7 +31,8 @@ MAKE_JOBS_SAFE= yes USE_APACHE= 20+ GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-apxs=${APXS} \ --disable-libFLACtest --disable-vorbistest diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile index 4002d00..d75b796 100644 --- a/www/mod_ruby/Makefile +++ b/www/mod_ruby/Makefile @@ -24,7 +24,6 @@ USE_PERL5_BUILD= yes CONFIGURE_ARGS= --with-apxs="${APXS}" CFLAGS+= -DONIG_ESCAPE_REGEX_T_COLLISION -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" MAKE_ARGS= RUBY="${RUBY}" INSTALL_TARGET= site-install diff --git a/www/nscache/Makefile b/www/nscache/Makefile index 7a12a58..d36db55 100644 --- a/www/nscache/Makefile +++ b/www/nscache/Makefile @@ -22,13 +22,12 @@ USE_GNOME= gnomehier gtk12 USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} --disable-gnome MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-install: ${INSTALL_DATA} ${WRKSRC}/nscache.desktop \ diff --git a/www/oops/Makefile b/www/oops/Makefile index c4773a5..daf7b94 100644 --- a/www/oops/Makefile +++ b/www/oops/Makefile @@ -28,10 +28,10 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \ --libdir=${PREFIX}/libexec/oops \ --enable-oops-user=oops \ --enable-large-files -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CFLAGS+= -fPIC +CXXFLAGS+= -fPIC OOPSVAR= /var/run/oops OOPSLOG= /var/log/oops diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index a0ca7d0..7e9769d 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -30,10 +30,10 @@ USE_JAVA= yes GNU_CONFIGURE= yes LIBTOOLFILES= configure CONFIGURE_ARGS= --enable-gecko-rpath -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \ LIBS="-lm" BOOST_LIB_SUFFIX="" +CPPFLAGS+= -I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L} +LDFLAGS+= -L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS} USE_GMAKE= yes USE_LDCONFIG= yes USE_GECKO= libxul diff --git a/www/pecl-amfext/Makefile b/www/pecl-amfext/Makefile index 07f7201..c8726c1 100644 --- a/www/pecl-amfext/Makefile +++ b/www/pecl-amfext/Makefile @@ -21,6 +21,6 @@ USE_PHPEXT= yes PHP_MODNAME= amf CONFIGURE_ARGS= --enable-amf -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/php/ext/standard" +CPPFLAGS+= -I${LOCALBASE}/include/php/ext/standard .include <bsd.port.mk> diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index a2dca37..1c00141 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -32,8 +32,8 @@ CONFLICTS= privoxy-devel-[0-9]* MAN1= privoxy.1 -CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \ - CPPFLAGS=-I${LOCALBASE}/include/ +CPPFLAGS+= -I${LOCALBASE}/include/ +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= ACCEPT_FILTER "Enable support for accf_http(9)" Off \ DEBUG "Build with debugging symbols" Off \ diff --git a/www/resin2/Makefile b/www/resin2/Makefile index d7960f5..b59fb2d 100644 --- a/www/resin2/Makefile +++ b/www/resin2/Makefile @@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \ LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl # We need to link with cc instead of ld for the FreeBSD specific options used # by threading libraries -CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} # Install the Apache plugin if needed .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES) diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 5292864..1dc86dc 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \ LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl # We need to link with cc instead of ld for the FreeBSD specific options used # by threading libraries -CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL} +CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL} # Install the Apache plugin if needed .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES) diff --git a/www/retawq/Makefile b/www/retawq/Makefile index 80b31f0..cc8230f 100644 --- a/www/retawq/Makefile +++ b/www/retawq/Makefile @@ -17,7 +17,6 @@ COMMENT= An interactive, multi-threaded web browser for text terminals USE_GETTEXT= yes HAS_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --path-archprefix=${PREFIX} --path-prefix=${PREFIX} \ --enable-i18n --enable-local-cgi --enable-ipv6 @@ -29,8 +28,8 @@ PLIST_FILES= bin/retawq \ share/locale/pt_BR/LC_MESSAGES/retawq.mo PORTDOCS= * -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls diff --git a/www/rsstail/Makefile b/www/rsstail/Makefile index 62711d4..6b79f27 100644 --- a/www/rsstail/Makefile +++ b/www/rsstail/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= mrss.19:${PORTSDIR}/textproc/libmrss CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/${PORTNAME} MAN1= ${PORTNAME}.1 diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 7798489..868470c 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CC="${CC}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --sysconfdir="${PREFIX}/etc/${PORTNAME}" \ --enable-sargphp="${PREFIX}/etc/${PORTNAME}" \ --enable-fontdir="${PREFIX}/etc/${PORTNAME}/fonts" \ diff --git a/www/screem/Makefile b/www/screem/Makefile index 17ae89af..cb6aff1 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -22,8 +22,8 @@ USE_GNOME= desktopfileutils gnomehack gnomemenus gnomeprefix \ USE_XORG= xpm USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_OMF= yes GCONF_SCHEMAS= screem.schemas diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 56a79a7..4bfd8ac 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -32,7 +32,7 @@ USE_GL= gl MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" +CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 2976814..beff894 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -32,8 +32,9 @@ ALL_TARGET= default MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include/cairo" \ +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func__Unwind_Backtrace=no +CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ MOZ_EXTENSIONS= default diff --git a/www/squid/Makefile b/www/squid/Makefile index 1cdfdb3..1171e7f 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -384,8 +384,7 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - GREP="${GREP}" +CONFIGURE_ENV+= GREP="${GREP}" PLIST_DIRS= %%ETCDIR%%/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \ diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 009371d..ff31ee0 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -387,8 +387,6 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" - PLIST_DIRS= %%ETCDIR%%/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} diff --git a/www/squid31/Makefile b/www/squid31/Makefile index c5fdd6a..9df1f85 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -415,8 +415,6 @@ WITH_DEBUG?= yes # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" - PLIST_DIRS= %%ETCDIR%%/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} diff --git a/www/srg/Makefile b/www/srg/Makefile index e94663b..e6e2ac8 100644 --- a/www/srg/Makefile +++ b/www/srg/Makefile @@ -19,7 +19,6 @@ USE_GMAKE= yes USE_BISON= build USE_BZIP2= yes NO_INSTALL_MANPAGES= yes -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" post-patch: ${REINPLACE_CMD} -e 's|-g |${CFLAGS} ${CPPFLAGS} |' ${WRKSRC}/Makefile \ diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile index 5627228..410db24 100644 --- a/www/tntnet/Makefile +++ b/www/tntnet/Makefile @@ -21,15 +21,15 @@ USE_ICONV= yes USE_CSTD= gnu89 PATCH_STRIP= -p1 GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFIGURE_ARGS+= --localstatedir=/var .if defined(WITH_GNUTLS) -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls CONFIGURE_ARGS+= --with-ssl=gnutls LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls .else -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-ssl=openssl .endif diff --git a/www/tokyopromenade/Makefile b/www/tokyopromenade/Makefile index 093c839..0d5f747 100644 --- a/www/tokyopromenade/Makefile +++ b/www/tokyopromenade/Makefile @@ -32,7 +32,7 @@ MAN1= prommgr.1 .if defined(WITH_LUA) CONFIGURE_ARGS+= --enable-lua -CONFIGURE_ENV+= LDFLAGS="-L${LUA_LIBDIR}" +LDFLAGS+= -L${LUA_LIBDIR} CFLAGS+= -I${LUA_INCDIR} USE_LUA= yes .endif diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 12bfce8..cd5e651 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -28,7 +28,7 @@ USE_TCL= yes USE_RC_SUBR= ${PORTNAME} USE_LDCONFIG= yes -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-expat=${LOCALBASE} \ --with-pcre=${LOCALBASE} diff --git a/www/ump/Makefile b/www/ump/Makefile index e6aef9c..5b390b7 100644 --- a/www/ump/Makefile +++ b/www/ump/Makefile @@ -36,7 +36,7 @@ TIMIDITY_VERSION= 2.13.2 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-ump --with-default-path=${LOCALBASE}/share/timidity -CONFIGURE_ENV= LDFLAGS=-export-dynamic +LDFLAGS+= -export-dynamic USE_GMAKE= yes USE_XORG= xpm xmu WANT_GNOME= yes diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index f44c7f3..3c70d0a 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -87,7 +87,7 @@ CONFIGURE_ARGS+= --enable-dns \ --with-gdlib=${LOCALBASE}/lib \ --with-gd=${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib" +LDFLAGS+= -L${PREFIX}/lib CFLAGS+= -Wall MAN1= ${PKGNAMEPREFIX}webalizer.1 ${PKGNAMEPREFIX}wcmgr.1 DOC1= CHANGES Copyright INSTALL \ diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 2a6de9a..e95843b 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -36,10 +36,10 @@ USE_GNOME= gtk20 libxslt ltverhack USE_PERL5= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ +CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ ac_cv_path_DOLT_BASH="" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-icon-database \ --with-gtk=2.0 \ --enable-svg \ diff --git a/www/websh/Makefile b/www/websh/Makefile index 32b9a7a..3946341 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -85,8 +85,4 @@ post-install: @${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/mod_${MODULENAME}.so" @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> - -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile index 4fca899..1445847 100644 --- a/www/webstone-ssl/Makefile +++ b/www/webstone-ssl/Makefile @@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/WebStone${PORTVERSION}/src ALL_TARGET= install NO_INSTALL_MANPAGES= yes -CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${OPENSSLINC}" \ - LIBS=-L${OPENSSLLIB} +CONFIGURE_ENV= LIBS=-L${OPENSSLLIB} +CFLAGS+= -I${OPENSSLINC} do-install: @${RMDIR} ${WRKSRC}/../bin/runs diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile index a93473f..3c67932 100644 --- a/www/wsdlpull/Makefile +++ b/www/wsdlpull/Makefile @@ -16,9 +16,8 @@ COMMENT= C++ WSDL Parser LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile index 699abc1..10b6d45 100644 --- a/www/xapian-omega/Makefile +++ b/www/xapian-omega/Makefile @@ -21,8 +21,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PERL5_RUN= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= omindex.1 scriptindex.1 diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile index c53e9d5..bf2a489 100644 --- a/www/ziproxy/Makefile +++ b/www/ziproxy/Makefile @@ -24,8 +24,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-cfgfile="${PREFIX}/etc/ziproxy/ziproxy.conf" |
