diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-09-23 22:26:39 +0000 |
| commit | 6f6fbe4bdf9851de1eb6ebef5287e3007846045e (patch) | |
| tree | 3b556699991305af672fba96e0e8b6bb88bcc7da /security | |
| parent | 86f8cde1da39aadc3efbc11e60998d886c86c36e (diff) | |
| download | ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.tar.gz ports-6f6fbe4bdf9851de1eb6ebef5287e3007846045e.zip | |
Notes
Diffstat (limited to 'security')
85 files changed, 122 insertions, 152 deletions
diff --git a/security/aide/Makefile b/security/aide/Makefile index fac93811e3fc..dc8247451965 100644 --- a/security/aide/Makefile +++ b/security/aide/Makefile @@ -29,8 +29,8 @@ CONFIGURE_ARGS+=--with-mhash \ --mandir=${MANPREFIX}/man \ --with-config_file=${PREFIX}/etc/aide.conf -CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include MAN1= aide.1 MAN5= aide.conf.5 diff --git a/security/authforce/Makefile b/security/authforce/Makefile index 04fb3057f307..fe894a1c5ffd 100644 --- a/security/authforce/Makefile +++ b/security/authforce/Makefile @@ -15,7 +15,8 @@ COMMENT= HTTP authentication brute forcer LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl" +CONFIGURE_ENV= LIBS="-lintl" +LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile index 52c01ab75f82..9cc620adeed5 100644 --- a/security/barnyard2/Makefile +++ b/security/barnyard2/Makefile @@ -24,7 +24,6 @@ OPTIONS+= TCL "Enable TCL support" off USE_RC_SUBR= barnyard2.sh GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" SUB_FILES= pkg-message PORTDOCS1= README diff --git a/security/bcrypt/Makefile b/security/bcrypt/Makefile index 5f3ef738c74b..0fcf40168189 100644 --- a/security/bcrypt/Makefile +++ b/security/bcrypt/Makefile @@ -19,7 +19,6 @@ MAKE_JOBS_SAFE= yes ALL_TARGET= ${PORTNAME} LDFLAGS+= -lz -MAKE_ENV+= LDFLAGS="${LDFLAGS}" PORTDOCS= README MAN1= bcrypt.1 diff --git a/security/bioapi/Makefile b/security/bioapi/Makefile index 182f01ca5a17..3a24ea7aa39c 100644 --- a/security/bioapi/Makefile +++ b/security/bioapi/Makefile @@ -19,7 +19,7 @@ USE_AUTOTOOLS= libtool USE_BZIP2= yes GNU_CONFIGURE= yes # Problems reported with higher optimization levels -CONFIGURE_ENV=CFLAGS="${CFLAGS} -O" +CFLAGS+= -O CONFIGURE_ARGS= --localstatedir=/var/db/ --with-Qt-dir=no USE_LDCONFIG= yes diff --git a/security/bro/Makefile b/security/bro/Makefile index ad4ecb4292bd..e601208bd9c1 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -22,8 +22,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-perftools \ --disable-broccoli \ --disable-broctl -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index fcdb2d50b333..e08c9e210704 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -47,8 +47,6 @@ PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads USE_AUTOTOOLS= libltdl -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --libdir=${PREFIX}/lib \ --with-dbdir=${DBDIR} \ --with-zlib=/usr \ diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 243fce35ca33..cc1e373ff0e4 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -44,8 +44,6 @@ PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads USE_AUTOTOOLS= libltdl -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --libdir=${PREFIX}/lib \ --with-dbdir=${DBDIR} \ --with-zlib=/usr \ diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 6de8aacbfd7c..0937e8d52f68 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -57,8 +57,6 @@ USERDB?= ${PREFIX}/etc/userdb CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE_ENV:= ${CONFIGURE_ENV} CONFIGURE_ARGS= --enable-unicode \ diff --git a/security/courierpassd/Makefile b/security/courierpassd/Makefile index 1825242499fe..2388bed64d38 100644 --- a/security/courierpassd/Makefile +++ b/security/courierpassd/Makefile @@ -21,7 +21,6 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}' MINUID?= 100 DELAY?= 3 diff --git a/security/courierpasswd/Makefile b/security/courierpasswd/Makefile index a116d623e4d6..5edca04e66a7 100644 --- a/security/courierpasswd/Makefile +++ b/security/courierpasswd/Makefile @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}' MINUID?= 100 diff --git a/security/courieruserinfo/Makefile b/security/courieruserinfo/Makefile index 44d0b5744b6c..1a4216259efa 100644 --- a/security/courieruserinfo/Makefile +++ b/security/courieruserinfo/Makefile @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}' MAN8= courieruserinfo.8 diff --git a/security/crank/Makefile b/security/crank/Makefile index da656f488911..d205db4e12da 100644 --- a/security/crank/Makefile +++ b/security/crank/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= guile:${PORTSDIR}/lang/guile USE_GNOME= gtk12 GNU_CONFIGURE= yes GUILE_CONFIG= ${LOCALBASE}/bin/guile-config -CONFIGURE_ENV= CFLAGS="${CFLAGS} `${GUILE_CONFIG} compile`" \ - LDFLAGS="`${GUILE_CONFIG} link`" +LDFLAGS+= `${GUILE_CONFIG} link` +CFLAGS+= `${GUILE_CONFIG} compile` USE_GMAKE= yes INFO= crank diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 81881d010ace..de20d55df18e 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -165,7 +165,6 @@ CONFIGURE_ARGS+=--enable-ntlm .if ${ARCH} == "amd64" CPPFLAGS+= -fPIC -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .endif .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 060f72fbb565..9ad031047eb0 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -32,7 +32,7 @@ INFO= dirmngr MAN1= dirmngr-client.1 dirmngr.1 CONFIGURE_ARGS+= --docdir=${DOCSDIR} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= NLS "National Language Support" off diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index 5d515e038b73..2254a16066ef 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -24,7 +24,7 @@ USE_RC_SUBR= ${PORTNAME} .include <bsd.port.pre.mk> .if defined(WITH_STATIC) -CONFIGURE_ENV= LDFLAGS=-static +LDFLAGS+= -static .endif post-patch: diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile index b94440e40952..e02d4b6cc485 100644 --- a/security/firewalk/Makefile +++ b/security/firewalk/Makefile @@ -22,8 +22,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/Firewalk GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags` +LDFLAGS+= -L${LOCALBASE}/lib MAN8= firewalk.8 LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config diff --git a/security/fpm/Makefile b/security/fpm/Makefile index 5f659b30b9d3..922adc525fe8 100644 --- a/security/fpm/Makefile +++ b/security/fpm/Makefile @@ -17,8 +17,8 @@ COMMENT= Figaro's Password Manager, an app to securely store your passwords USE_GNOME= gnomeprefix gnomehack gnomelibs GNU_CONFIGURE= yes #CONFIGURE_ARGS+= --without-included-gettext -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include MAN1= fpm.1 PORTDOCS= AUTHORS ChangeLog README TODO diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile index 59b18fe4d6fe..9920877f75b8 100644 --- a/security/fprint_demo/Makefile +++ b/security/fprint_demo/Makefile @@ -25,8 +25,8 @@ PLIST_FILES+= bin/fprint_demo .include <bsd.port.pre.mk> CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \ - CRYPTO_LIBS=-lcrypto \ - CFLAGS="${CFLAGS} -DHAVE_MEMMEM" + CRYPTO_LIBS=-lcrypto +CFLAGS+= -DHAVE_MEMMEM post-install: @${ECHO} diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile index 115f059a8166..377bfc04928f 100644 --- a/security/fwbuilder-devel/Makefile +++ b/security/fwbuilder-devel/Makefile @@ -50,9 +50,9 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22 CONFIGURE_SCRIPT= autogen.sh GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} MAKE_ARGS+= QTDIR="${QTDIR}" \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index ba7584911f10..b5d041bca5fd 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -54,9 +54,9 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf aclocal libtool CONFIGURE_SCRIPT= autogen.sh GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} MAKE_ARGS+= QTDIR="${QTDIR}" \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 4428530905df..789888cb4fc7 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \ --with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml \ org.gnome.crypto.pgp.gschema.xml diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile index bf533c3ab6be..f9593943a0b9 100644 --- a/security/gnutls-devel/Makefile +++ b/security/gnutls-devel/Makefile @@ -29,7 +29,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-guile --disable-silent-rules \ --disable-hardware-acceleration MANCOMPRESSED= no diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 1b08c7d1d890..69d1dd70d5cf 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -30,7 +30,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-guile MANCOMPRESSED= no diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 7e52ef96149e..30715dc415fe 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -23,8 +23,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ GPGKEYS_LDAP="${LOCALBASE}/libexec/gpg2keys_ldap" +CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_SAFE= yes LICENSE= GPLv3 diff --git a/security/gpass/Makefile b/security/gpass/Makefile index 2fb665e215c9..df2924990da4 100644 --- a/security/gpass/Makefile +++ b/security/gpass/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \ mhash:${PORTSDIR}/security/mhash GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -export-dynamic" +LDFLAGS+= -L${LOCALBASE}/lib -export-dynamic USE_GMAKE= yes MAN1= gpass.1 gpass.ja.1 gpass-convert.1 gpass-convert.ja.1 diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile index f6c3f59c411c..33cc581d9e60 100644 --- a/security/gringotts/Makefile +++ b/security/gringotts/Makefile @@ -19,10 +19,9 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ USE_GNOME= gtk20 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 post-patch: @${REINPLACE_CMD} -e \ diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index c8eef7cb239c..826243ed1659 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -24,7 +24,6 @@ LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn \ USE_GNOME= gnomehack pkgconfig USE_PERL5_BUILD= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes INFO= gsasl @@ -37,8 +36,8 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -CPPFLAGS= -I/usr/include -I${LOCALBASE}/include -LDFLAGS= -L/usr/lib -L${LOCALBASE}/lib +CPPFLAGS+= -I/usr/include -I${LOCALBASE}/include +LDFLAGS+= -L/usr/lib -L${LOCALBASE}/lib post-patch: .for file in \ diff --git a/security/gss/Makefile b/security/gss/Makefile index 348b3f709d3a..ced24169bdcd 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -22,15 +22,14 @@ CONFLICTS= heimdal-[0-9]* USE_PERL5_BUILD= yes USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-kerberos5 USE_LDCONFIG= yes INFO= gss PORTDOCS= gss.html gss.ps gss.pdf -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include "Makefile.man" .include <bsd.port.pre.mk> diff --git a/security/klamav/Makefile b/security/klamav/Makefile index ab1ba6e42667..28bec1f9cfdc 100644 --- a/security/klamav/Makefile +++ b/security/klamav/Makefile @@ -29,7 +29,7 @@ INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool aclocal LIBTOOLFILES= acinclude.m4 configure -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib" +LDFLAGS+= ${PTHREAD_LIBS} -lintl -L${PREFIX}/lib CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \ --without-included-sqlite diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index 025f1b97ddab..eb938f79263b 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -33,8 +33,7 @@ USE_PERL5_BUILD= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool autoheader autoconf CONFIGURE_ARGS?= --enable-shared --with-krb5=${PREFIX}/bin/krb5-config -CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ - CFLAGS="${CFLAGS}" +CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc MAKE_ARGS= INSTALL="${INSTALL}" PATCH_DIST_STRIP= -p1 diff --git a/security/libecc/Makefile b/security/libecc/Makefile index b8f3633a2bcb..4509349e58f3 100644 --- a/security/libecc/Makefile +++ b/security/libecc/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ - CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include" +CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include +LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} 's@endian\.h@sys/&@' ${WRKSRC}/include/libecc/bitset.h diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile index 97c736d3a2ba..f446efb1a056 100644 --- a/security/libfprint/Makefile +++ b/security/libfprint/Makefile @@ -23,8 +23,8 @@ USE_OPENSSL= yes USE_GNOME= glib20 pkgconfig CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \ - CRYPTO_LIBS=-lcrypto \ - CFLAGS="${CFLAGS} -DHAVE_MEMMEM" + CRYPTO_LIBS=-lcrypto +CFLAGS+= -DHAVE_MEMMEM .include <bsd.port.pre.mk> diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile index fdcf55faca68..848ae949c725 100644 --- a/security/libfwbuilder-devel/Makefile +++ b/security/libfwbuilder-devel/Makefile @@ -53,9 +53,9 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:268 aclocal:111 libtool:22 CONFIGURE_SCRIPT= autogen.sh GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} MAKE_ARGS+= QTDIR="${QTDIR}" \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile index ccd58fa23a34..f27a9179118e 100644 --- a/security/libgnome-keyring/Makefile +++ b/security/libgnome-keyring/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile index 6e7a919b71ff..ab8bb0c7bd65 100644 --- a/security/libgnomesu/Makefile +++ b/security/libgnomesu/Makefile @@ -18,8 +18,8 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libgnomeui CONFIGURE_ARGS+=--disable-install-pam -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \ diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile index 87fb8e664584..71aa438ff8f4 100644 --- a/security/libgringotts/Makefile +++ b/security/libgringotts/Makefile @@ -20,7 +20,8 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \ USE_AUTOTOOLS= libtool USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig USE_LDCONFIG= yes diff --git a/security/lsh/Makefile b/security/lsh/Makefile index 400e57c6b003..f6012156ffc3 100644 --- a/security/lsh/Makefile +++ b/security/lsh/Makefile @@ -23,10 +23,9 @@ GNU_CONFIGURE= yes USE_XORG= xau USE_GMAKE= yes INSTALL_TARGET= install -CONFIGURE_ENV= PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}" +CONFIGURE_ENV= PREFIX="${PREFIX}" CONFIGURE_ARGS+= --with-include-path=${LOCALBASE}/include CONFIGURE_ARGS+= --with-lib-path=${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .if defined(KRB5_HOME) && exists(${KRB5_HOME}) PLIST_SUB+= KRB="" .else diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile index 612c1fe545f1..6643fa5c318a 100644 --- a/security/mcrypt/Makefile +++ b/security/mcrypt/Makefile @@ -24,8 +24,8 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \ USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl CONFIGURE_ARGS= --enable-static --with-catgets MAN1= mcrypt.1 diff --git a/security/nmap/Makefile b/security/nmap/Makefile index f5b6978c4ad6..047cd6d2ae40 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -45,7 +45,7 @@ MAN1_EN= ncat.1 nping.1 .ifndef WITHOUT_SSL USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${OPENSSLINC}" +CFLAGS+= -I${OPENSSLINC} PLIST_SUB+= WITHSSL="" .else PKGNAMESUFFIX= -nossl diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile index b53785735680..0ebc5f244c62 100644 --- a/security/opencryptoki/Makefile +++ b/security/opencryptoki/Makefile @@ -49,7 +49,7 @@ CONFIGURE_ARGS= --enable-swtok --enable-tpmtok \ --localstatedir=${PREFIX}/var \ --with-pkcs11user=${USERS} \ --with-pkcs11group=${GROUPS} -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/security/openscep/Makefile b/security/openscep/Makefile index eca683d8c2e2..6fdeb38af5b4 100644 --- a/security/openscep/Makefile +++ b/security/openscep/Makefile @@ -31,12 +31,11 @@ PLIST_DIRSTRY= www/cgi-bin .endif CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-html-install-dir="${PREFIX}/www/openscep" \ --with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \ --with-openscep-dir="${PREFIX}/etc/openscep" \ --with-pkiclientexe="${PREFIX}/www/cgi-bin/pkiclient.exe" -MAKE_ENV= CPPFLAGS=${CPPFLAGS} CONF_DIR= ${PREFIX}/etc/${PORTNAME} LOCAL_CONF_FILES= openscep.cnf openscep.ldif openscep.schema slapd.conf diff --git a/security/openssl_tpm_engine/Makefile b/security/openssl_tpm_engine/Makefile index cc6e0ea2aa2b..943e285fa6c2 100644 --- a/security/openssl_tpm_engine/Makefile +++ b/security/openssl_tpm_engine/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= YES GNU_CONFIGURE= YES MAKE_JOBS_SAFE= YES USE_AUTOTOOLS= autoconf libtool -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message diff --git a/security/openvas-libraries/Makefile.common b/security/openvas-libraries/Makefile.common index 8741e0850c9b..a88c4b9c1c33 100644 --- a/security/openvas-libraries/Makefile.common +++ b/security/openvas-libraries/Makefile.common @@ -5,4 +5,3 @@ CONFIGURE_ARGS+=--includedir=${PREFIX}/include \ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${PREFIX}/include CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile index a0173cb8d4e3..12c10f35c6dd 100644 --- a/security/openvpn-admin/Makefile +++ b/security/openvpn-admin/Makefile @@ -21,8 +21,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/b//} USE_GMAKE= yes USE_GNOME= gtksharp20 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/security/osslsigncode/Makefile b/security/osslsigncode/Makefile index 124cdd51acff..c8131be88605 100644 --- a/security/osslsigncode/Makefile +++ b/security/osslsigncode/Makefile @@ -16,9 +16,8 @@ COMMENT= OpenSSL-based signcode utility PLIST_FILES= bin/osslsigncode -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_GMAKE= yes USE_OPENSSL= yes diff --git a/security/pam_authsrv/Makefile b/security/pam_authsrv/Makefile index ecb629aeb9be..917d9c41f115 100644 --- a/security/pam_authsrv/Makefile +++ b/security/pam_authsrv/Makefile @@ -19,8 +19,8 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/security/fwtk:build RESTRICTED= No form of redistribution is allowed, because of linkging against fwtk USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${PORTSDIR}/security/fwtk/work/fwtk" \ - CFLAGS="${CFLAGS} -I${PORTSDIR}/security/fwtk/work/fwtk" +LDFLAGS+= -L${PORTSDIR}/security/fwtk/work/fwtk +CFLAGS+= -I${PORTSDIR}/security/fwtk/work/fwtk CONFIGURE_ARGS= --disable-encap --disable-epkg-install INSTALL_TARGET= install-real diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile index c9dbb0df143e..8081eb8f1782 100644 --- a/security/pam_krb5/Makefile +++ b/security/pam_krb5/Makefile @@ -38,7 +38,6 @@ IGNORE= You must define KRB5_IMPL to be \"mit\" or \"heimdal\" MANDIR= ${MANPREFIX}/man MANDIR= ${PREFIX}/share/man KRB5_DIR?= ${LOCALBASE} -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" post-install: diff --git a/security/pamtester/Makefile b/security/pamtester/Makefile index ca7dfe424cc4..f80ed2938f86 100644 --- a/security/pamtester/Makefile +++ b/security/pamtester/Makefile @@ -5,20 +5,20 @@ # $FreeBSD$ # -PORTNAME= pamtester -PORTVERSION= 0.1.2 -CATEGORIES= security -MASTER_SITES= SF +PORTNAME= pamtester +PORTVERSION= 0.1.2 +CATEGORIES= security +MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org -COMMENT= A command line pam authentication tester +MAINTAINER= ports@FreeBSD.org +COMMENT= A command line pam authentication tester -MAN1= pamtester.1 +MAN1= pamtester.1 -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -USE_GMAKE= yes +GNU_CONFIGURE= yes +CPPFLAGS+= ${CFLAGS} +USE_GMAKE= yes -PLIST_FILES= bin/pamtester +PLIST_FILES= bin/pamtester .include <bsd.port.mk> diff --git a/security/parano/Makefile b/security/parano/Makefile index 640fb540a04b..6c7daa2a5d5d 100644 --- a/security/parano/Makefile +++ b/security/parano/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile index c6f9caa95201..e69f5060a69d 100644 --- a/security/pecl-gnupg/Makefile +++ b/security/pecl-gnupg/Makefile @@ -25,7 +25,7 @@ PHP_MODNAME= gnupg CONFIGURE_ARGS= --with-gnupg=${LOCALBASE}/include/gpgme CFLAGS+= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e "s|\$$GNUPG_DIR/lib|${LOCALBASE}/lib|" -e "s|-ldl||g" \ diff --git a/security/pecl-ssh2/Makefile b/security/pecl-ssh2/Makefile index b49b68270756..4f3c4b2ccdd6 100644 --- a/security/pecl-ssh2/Makefile +++ b/security/pecl-ssh2/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= ssh2:${PORTSDIR}/security/libssh2 USE_PHP= yes USE_PHPEXT= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} CONFIGURE_ARGS= --with-ssh2 diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile index 1a6dbd0e6bd7..b83a9b148f92 100644 --- a/security/pidgin-encryption/Makefile +++ b/security/pidgin-encryption/Makefile @@ -24,8 +24,8 @@ USE_GMAKE= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \ --with-nspr-libs=${LOCALBASE}/lib \ --with-nss-includes=${LOCALBASE}/include/nss/nss \ diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile index 0eb29f5d1480..899baa3b4424 100644 --- a/security/pidgin-otr/Makefile +++ b/security/pidgin-otr/Makefile @@ -36,8 +36,8 @@ USE_GNOME= intltool USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-libotr-prefix=${LOCALBASE}/lib \ --with-libotr-inc-prefix=${LOCALBASE}/include diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index c993a0a48d32..424e9ab519c7 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -27,7 +27,6 @@ INFO= pinentry CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .if !defined(PINENTRY_SLAVE) OPTIONS= NCURSES "Curses frontend" on \ diff --git a/security/pks/Makefile b/security/pks/Makefile index 718ab25dc7c5..d5467622a91c 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -25,7 +25,8 @@ USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \ --sysconfdir=${EXAMPLESDIR} \ --libdir=${LOCALBASE}/lib --with-libwrap -MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib SUBDIRS= +MAKE_ENV+= SUBDIRS= +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h USE_RC_SUBR= pksd.sh diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 1d9f1600bbf6..afe7a92ae040 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -22,8 +22,8 @@ USE_AUTOTOOLS= autoconf USE_RC_SUBR= prelude-manager.sh CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --localstatedir=/var -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LIBS="${LIBS} -L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include USERS?= prelude GROUPS?= prelude diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile index 03e7d76f06bd..b5e9c6a8326a 100644 --- a/security/py-bcrypt/Makefile +++ b/security/py-bcrypt/Makefile @@ -25,7 +25,7 @@ PYEASYINSTALL_EGG= ${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}${PYEASY PLIST_FILES= %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib PROJECTHOST= py-bcrypt diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile index 17fd85ead9b9..277412ffa50c 100644 --- a/security/py-crack/Makefile +++ b/security/py-crack/Makefile @@ -26,13 +26,10 @@ GNU_CONFIGURE= yes PLIST_FILES:= ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}/_crack.so \ ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,}/crack.py -CONFIGURE_ENV= "CPPFLAGS=-I${LOCALBASE}/include" \ - "LDFLAGS=-L${LOCALBASE}/lib" \ - "DEFAULT_DICTPATH=${LOCALBASE}/libdata/cracklib/pw_dict" - -MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib" - -CFLAGS+= "-I${LOCALBASE}/include" +CONFIGURE_ENV= "DEFAULT_DICTPATH=${LOCALBASE}/libdata/cracklib/pw_dict" +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include post-patch: ${REINPLACE_CMD} -e 's/setup(/setup(name="${PORTNAME}",version="${PORTVERSION}",/' \ diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile index 9a291661deec..722fdb8932ea 100644 --- a/security/py-mhash/Makefile +++ b/security/py-mhash/Makefile @@ -24,7 +24,7 @@ USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= python-mhash CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib test: install ${PYTHON_CMD} ${WRKSRC}/test.py diff --git a/security/revelation/Makefile b/security/revelation/Makefile index b7ddaa2e0145..200d71fd71e3 100644 --- a/security/revelation/Makefile +++ b/security/revelation/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= crack:${PORTSDIR}/security/cracklib BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index 6b3d5a1f59cf..e4ff75cfcacf 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -27,8 +27,8 @@ USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= NAUTILUS "Enable the Nautilus component" on \ GEDIT "Enable GEdit plug-in support" on \ diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 6a9dd20e316f..9335cb9350c2 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -35,8 +35,8 @@ USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-introspection=no GCONF_SCHEMAS= seahorse.schemas diff --git a/security/shishi/Makefile b/security/shishi/Makefile index 1be337995527..c596a200a1a9 100644 --- a/security/shishi/Makefile +++ b/security/shishi/Makefile @@ -25,8 +25,7 @@ USE_PERL5_BUILD= yes USE_GNOME= gnomehack pkgconfig USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - MAKEINFO="makeinfo --no-split" +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --with-db-dir=/var/shishi USE_LDCONFIG= yes @@ -34,8 +33,8 @@ INFO= shishi SUB_FILES= pkg-message -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include "Makefile.man" .include <bsd.port.pre.mk> diff --git a/security/snort/Makefile b/security/snort/Makefile index 146bbd6a408d..79806411142a 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -46,7 +46,6 @@ OPTIONS= IPV6 "Enable IPv6 support" on \ USE_RC_SUBR= snort.sh SUB_FILES= pkg-message GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" MAKE_JOBS_UNSAFE= yes CONFIG_DIR?= ${PREFIX}/etc/snort diff --git a/security/snort_inline/Makefile b/security/snort_inline/Makefile index c5599b88130b..efba74fdbfe6 100644 --- a/security/snort_inline/Makefile +++ b/security/snort_inline/Makefile @@ -16,7 +16,6 @@ COMMENT= An inline IPS system based on snort using ipfw LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-inline --enable-ipfw LIB_DEPENDS+= dnet:${PORTSDIR}/net/libdnet diff --git a/security/spass/Makefile b/security/spass/Makefile index ae024d767967..872f3e1bdd7b 100644 --- a/security/spass/Makefile +++ b/security/spass/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= boost_program_options:${PORTSDIR}/devel/boost-libs GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" USE_BZIP2= yes PLIST_FILES= bin/spass diff --git a/security/spybye/Makefile b/security/spybye/Makefile index f06ca59ca3d0..9981e037108a 100644 --- a/security/spybye/Makefile +++ b/security/spybye/Makefile @@ -20,7 +20,6 @@ OPTIONS= CLAMAV "Enable CLAMAV support" off USE_RC_SUBR= spybye.sh GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" MAN1= spybye.1 diff --git a/security/squidclamav/Makefile b/security/squidclamav/Makefile index 72e47f59bf14..72e94e52df23 100644 --- a/security/squidclamav/Makefile +++ b/security/squidclamav/Makefile @@ -17,7 +17,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib NO_LATEST_LINK= yes SUB_FILES= pkg-message diff --git a/security/steghide/Makefile b/security/steghide/Makefile index 6122fa0a4597..14079b524b08 100644 --- a/security/steghide/Makefile +++ b/security/steghide/Makefile @@ -25,8 +25,8 @@ USE_GETTEXT= yes USE_PERL5= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fpermissive" \ - LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt" +CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fpermissive MAN1= steghide.1 diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index a0cbca8fa159..a798a56f826b 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -75,13 +75,13 @@ BROKEN= 'The WITH_UCONTEXT, WITH_FORK and WITH_PTHREAD options are mutually excl .if defined(WITH_UCONTEXT) CONFIGURE_ARGS+=--with-threads=ucontext CPPFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} .elif defined(WITH_FORK) CONFIGURE_ARGS+=--with-threads=fork .else CONFIGURE_ARGS+=--with-threads=pthread CPPFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} .endif post-patch: diff --git a/security/sudo/Makefile b/security/sudo/Makefile index b831a273d0ac..7cb03a5a57ad 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -65,8 +65,8 @@ CONFIGURE_ARGS+= --with-logfac=${LOGFAC} .if !defined(WITHOUT_NLS) USE_GETTEXT= yes -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" +LDFLAGS+= -L${LOCALBASE}/lib -lintl +CFLAGS+= -I${LOCALBASE}/include PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls diff --git a/security/sudosh/Makefile b/security/sudosh/Makefile index ee89ef3210c6..5a383520fb9e 100644 --- a/security/sudosh/Makefile +++ b/security/sudosh/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}" .else CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh .endif -CONFIGURE_ENV= LDFLAGS="-lutil" +LDFLAGS+= -lutil MAN1= sudosh.1 MAN5= sudosh.conf.5 diff --git a/security/sudosh2/Makefile b/security/sudosh2/Makefile index 08c39833ef27..0aa7d9b4a689 100644 --- a/security/sudosh2/Makefile +++ b/security/sudosh2/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}" .else CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh .endif -CONFIGURE_ENV= LDFLAGS="-lutil" +LDFLAGS+= -lutil MAN1= sudosh.1 MAN5= sudosh.conf.5 diff --git a/security/sudosh3/Makefile b/security/sudosh3/Makefile index 68015dbc371e..91ef38f26fc8 100644 --- a/security/sudosh3/Makefile +++ b/security/sudosh3/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}" .else CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh .endif -CONFIGURE_ENV= LDFLAGS="-lutil" +LDFLAGS+= -lutil MAN1= sudosh.1 MAN5= sudosh.conf.5 diff --git a/security/tinc/Makefile b/security/tinc/Makefile index 62942263a3a5..59ceaa72345b 100644 --- a/security/tinc/Makefile +++ b/security/tinc/Makefile @@ -25,7 +25,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" USE_RC_SUBR= tincd.sh PLIST_FILES= sbin/tincd diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 623b05bd6698..d5fa76959845 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -47,8 +47,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ - TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \ +CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \ TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \ TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}" diff --git a/security/tor/Makefile b/security/tor/Makefile index 0de7cd1aaa78..a3f8170817a5 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -49,8 +49,7 @@ LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc \ --enable-linker-hardening -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ - TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \ +CONFIGURE_ENV= TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \ TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \ TOR_LIBEVENT_LIBS="-levent-2.0" diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile index 3c107d997b4a..0bdd3fb75d1b 100644 --- a/security/tpm-tools/Makefile +++ b/security/tpm-tools/Makefile @@ -25,7 +25,7 @@ USE_GETTEXT= YES USE_LDCONFIG= YES USE_AUTOTOOLS= autoconf GNU_CONFIGURE= YES -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl -liconv" +LDFLAGS+= -L${LOCALBASE}/lib -lintl -liconv MAKE_JOBS_SAFE= YES LICENSE= CPL diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile index 4adc200146f6..ba6509511c91 100644 --- a/security/tuntun/Makefile +++ b/security/tuntun/Makefile @@ -17,8 +17,8 @@ COMMENT= A Gnome applet gui for OpenVPN LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \ - LIBS="`pkg-config --libs libgnomeui-2.0`" +CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`" +CPPFLAGS+= `pkg-config --cflags libgnomeui-2.0` CONFIGURE_ARGS= --libdir=${PREFIX}/libdata/servers USE_GMAKE= yes diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile index 0a430dec5624..34e2f413ee9b 100644 --- a/security/vpnc/Makefile +++ b/security/vpnc/Makefile @@ -31,7 +31,7 @@ OPTIONS+= DECRYPT "cisco-decypt password decrypt utility" on OPTIONS+= SSL "OpenSSL certificate support (hybrid only)" off OPTIONS+= CISCOVERSION "Mask linux presentation string" off -MAKE_ENV+= LDFLAGS="${LDFLAGS}" BINS="${EXTRABUILDS}" +MAKE_ENV+= BINS="${EXTRABUILDS}" .include <bsd.port.pre.mk> diff --git a/security/yafic/Makefile b/security/yafic/Makefile index f6b9e3ed58ff..d9e26a174500 100644 --- a/security/yafic/Makefile +++ b/security/yafic/Makefile @@ -15,7 +15,7 @@ COMMENT= Yet Another File Integrity Checker, similar to Tripwire GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= LDFLAGS="-static" +LDFLAGS+= -static .if defined(WITHOUT_OPENSSL) CONFIGURE_ARGS= --disable-crypto diff --git a/security/yapet/Makefile b/security/yapet/Makefile index d10f43a1881c..b1e676eab7cd 100644 --- a/security/yapet/Makefile +++ b/security/yapet/Makefile @@ -56,8 +56,6 @@ CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " diff --git a/security/yara/Makefile b/security/yara/Makefile index 92b3b0397c20..1b5c3246e587 100644 --- a/security/yara/Makefile +++ b/security/yara/Makefile @@ -20,7 +20,6 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= "--with-re2" USE_LDCONFIG= yes diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 2c27edd1a3ba..f0e45fdc0196 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -17,7 +17,7 @@ USE_OPENSSL= YES USE_PERL5_BUILD=YES MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS=${PTHREAD_LIBS} \ + PTHREAD_LIBS=${PTHREAD_LIBS} MAN1= zebedee.1 ftpgw.tcl.1 |