diff options
Diffstat (limited to 'mail')
85 files changed, 125 insertions, 157 deletions
diff --git a/mail/abook/Makefile b/mail/abook/Makefile index 58bd9cff7deb..f75c54654f13 100644 --- a/mail/abook/Makefile +++ b/mail/abook/Makefile @@ -17,7 +17,6 @@ COMMENT= An addressbook program with mutt mail client support GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/mail/akpop3d/Makefile b/mail/akpop3d/Makefile index f3f70e47540f..3c726d247b48 100644 --- a/mail/akpop3d/Makefile +++ b/mail/akpop3d/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes .if defined(WITH_SSL) USE_OPENSSL= YES CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} -CONFIGURE_ENV= CPPFLAGS="-I${OPENSSLBASE}/include" +CPPFLAGS+= -I${OPENSSLBASE}/include LDFLAGS+= -L${OPENSSLBASE}/lib -lssl -lcrypto .endif diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile index b0e498809b2c..b7c806d2b5e0 100644 --- a/mail/anubis/Makefile +++ b/mail/anubis/Makefile @@ -27,8 +27,8 @@ MAN1= anubis.1 INFO= anubis PORTEXAMPLES= 1anubisrc 2anubisrc -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes OPTIONS= NLS "Native language support" on \ diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile index b409a2dacec2..4c34e25a57d3 100644 --- a/mail/asmail/Makefile +++ b/mail/asmail/Makefile @@ -17,7 +17,6 @@ COMMENT= Biff-type program, designed to match AfterStep USE_XORG= xpm USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shaping \ --with-xpm \ --with-xpm-includes=${LOCALBASE}/include \ diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 85c77399cc47..60f94942e41a 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -40,8 +40,8 @@ CONFIGURE_ARGS= --enable-threads \ --with-ssl \ --without-nm \ --with-canberra -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} MAN1= balsa.1 diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile index dd59e981babe..8b75092ec1b5 100644 --- a/mail/bmf/Makefile +++ b/mail/bmf/Makefile @@ -16,15 +16,15 @@ COMMENT= A fast Bayesian Mail Filter compatible with maildrop and procmail .if defined(WITH_BDB41) LIB_DEPENDS= db41.1:${PORTSDIR}/databases/db41 -CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= DB_LIBNAME=-ldb41 .elif defined(WITH_BDB4) LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4 -CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= DB_LIBNAME=-ldb4 .elif defined(WITH_BDB3) LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 -CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= DB_LIBNAME=-ldb3 .endif diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index 243f009f3b00..576c5b5ed174 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -51,8 +51,9 @@ LIB_DEPENDS+= gsl.16:${PORTSDIR}/math/gsl CONFIGURE_ARGS+= --with-included-gsl .endif CPPFLAGS+= ${BF_CPPFLAGS} -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" LIBS="${BF_LIBS}" \ +CONFIGURE_ENV+= LIBS="${BF_LIBS}" \ PERL="${PERL}" +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man MAN1= bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1 \ diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile index 356cdf3a3cac..7e25c6dff14c 100644 --- a/mail/claws-mail-address_keeper/Makefile +++ b/mail/claws-mail-address_keeper/Makefile @@ -25,7 +25,7 @@ USE_ICONV= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile index d30c15a8a3a7..2bd1ff596d3c 100644 --- a/mail/claws-mail-attach_warner/Makefile +++ b/mail/claws-mail-attach_warner/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-iconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile index 1a03eb2d799e..0bbb7083e4ca 100644 --- a/mail/claws-mail-bsfilter/Makefile +++ b/mail/claws-mail-bsfilter/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile index 72aafca46738..093bc5fd2c1f 100644 --- a/mail/claws-mail-clamd/Makefile +++ b/mail/claws-mail-clamd/Makefile @@ -26,7 +26,7 @@ USE_ICONV= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile index 5e265621fb45..684f602d9274 100644 --- a/mail/claws-mail-fancy/Makefile +++ b/mail/claws-mail-fancy/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gtk20 MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile index 3577098821c3..0bf9f4dcd1c3 100644 --- a/mail/claws-mail-gtkhtml2_viewer/Makefile +++ b/mail/claws-mail-gtkhtml2_viewer/Makefile @@ -27,7 +27,7 @@ USE_ICONV= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile index d0b19093a4a2..62e9293e674a 100644 --- a/mail/claws-mail-notification/Makefile +++ b/mail/claws-mail-notification/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile index 8db463ca5869..2f9bd6bd987c 100644 --- a/mail/claws-mail-python/Makefile +++ b/mail/claws-mail-python/Makefile @@ -27,7 +27,7 @@ USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile index 87b1b2188910..47ac84d79ba9 100644 --- a/mail/claws-mail-rssyl/Makefile +++ b/mail/claws-mail-rssyl/Makefile @@ -26,7 +26,7 @@ USE_ICONV= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile index af6242547cff..a838eb888679 100644 --- a/mail/claws-mail-spamreport/Makefile +++ b/mail/claws-mail-spamreport/Makefile @@ -27,7 +27,7 @@ USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile index 1a6480ada738..d828a94359ca 100644 --- a/mail/claws-mail-tnef/Makefile +++ b/mail/claws-mail-tnef/Makefile @@ -25,8 +25,8 @@ USE_XORG= x11 USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes -CPPFLAGS= "-I${LOCALBASE}/include" -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile index a8a344dcdeaf..c7e2efdb6ca5 100644 --- a/mail/claws-mail-vcalendar/Makefile +++ b/mail/claws-mail-vcalendar/Makefile @@ -28,7 +28,7 @@ USE_AUTOTOOLS= autoconf MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 1bcc18c43618..feebf7cbf864 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -46,8 +46,8 @@ CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= ALL "Enable all options." off \ ENCHANT "Enable spell checking support." on \ diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile index ff0b988e99c9..27a7d25c9c42 100644 --- a/mail/contact-lookup-applet/Makefile +++ b/mail/contact-lookup-applet/Makefile @@ -22,7 +22,7 @@ USE_GNOME= evolutiondataserver gnomehack gnomepanel gnomeprefix \ 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/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 75f9703af20a..9fb4ac1355fd 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -25,13 +25,10 @@ USE_GMAKE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl - CPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include LDFLAGS+= -L${LOCALBASE}/lib -L${PREFIX}/lib -CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash \ - CPPFLAGS='${CPPFLAGS}' \ - CXXFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' +CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash + MAKE_ENV:= ${CONFIGURE_ENV} # @@ -100,8 +97,7 @@ CONFIGURE_ARGS+=--with-trashquota .endif .if defined(WITH_FAM) -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_FAM= yes .endif diff --git a/mail/courier/Makefile b/mail/courier/Makefile index 3e4d798216a4..238351de9a2f 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -73,8 +73,6 @@ USE_RC_SUBR= courier.sh CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE_ENV:= ${CONFIGURE_ENV} CONFIGURE_ARGS= --disable-root-check \ diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index d05c124cb4d1..ecb0f1cfbcbb 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -38,7 +38,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes OPTIONS= AUTOCREATE "Use autocreate INBOX patch (UoA)" off \ diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 72ed06208a47..6bbb06097717 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -38,7 +38,8 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes OPTIONS= AUTOCREATE "Use autocreate INBOX patch (UoA)" off \ diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 0494516daecf..63cd45e405a0 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -32,7 +32,7 @@ USE_OPENSSL= YES CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail MAKE_ARGS+= mandir=${MANPREFIX}/man diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile index f8795f81115c..58f023928cd7 100644 --- a/mail/dbmail20/Makefile +++ b/mail/dbmail20/Makefile @@ -43,7 +43,7 @@ CFLAGS+= -I${LOCALBASE}/include/mysql LDFLAGS+= -L${LOCALBASE}/lib/mysql .endif -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} PORTDOCS= INSTALL README EXTRAS MAN1= dbmail-smtp.1 diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile index 14948847c59b..40904a73d711 100644 --- a/mail/dbmail21/Makefile +++ b/mail/dbmail21/Makefile @@ -35,7 +35,7 @@ USE_OPENSSL= YES CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \ README.aliases README.exim README.ldap \ diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile index 0494516daecf..63cd45e405a0 100644 --- a/mail/dbmail22/Makefile +++ b/mail/dbmail22/Makefile @@ -32,7 +32,7 @@ USE_OPENSSL= YES CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail MAKE_ARGS+= mandir=${MANPREFIX}/man diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile index 9dc49db2ec80..7df3f32cbfff 100644 --- a/mail/dbmail23/Makefile +++ b/mail/dbmail23/Makefile @@ -38,7 +38,7 @@ USE_OPENSSL= YES CFLAGS+= -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include/zdb ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} CONFIGURE_ARGS+=--with-pkglibdir=${LOCALBASE}/lib/dbmail \ --sysconfdir=${PREFIX}/etc MAKE_ARGS+= mandir=${MANPREFIX}/man diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile index 2b6eb7eebe20..f7c1410695fd 100644 --- a/mail/dcc-dccd/Makefile +++ b/mail/dcc-dccd/Makefile @@ -113,7 +113,6 @@ MILTERLIB= ${MILTERBASE}/lib CPPFLAGS+= -I${MILTERINC} LDFLAGS+= -L${MILTERLIB} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --with-sendmail=${MILTERBASE} PLIST_SUB+= WITH_DCCM="" diff --git a/mail/dovecot-sieve/Makefile b/mail/dovecot-sieve/Makefile index 0d37e6d68c40..be4876de9c8d 100644 --- a/mail/dovecot-sieve/Makefile +++ b/mail/dovecot-sieve/Makefile @@ -26,7 +26,6 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} \ --docdir=${DOCSDIR} \ --with-dovecot=`${MAKE} -C ${PORTSDIR}/mail/dovecot -V WRKSRC` -CONFIGURE_ENV= LDFLAGS='${LDFLAGS}' LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/dovecot/lda diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index a7a9ad5cf444..3efae3d59456 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -38,8 +38,8 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/dovecot \ ${PREFIX}/lib/dovecot/imap \ ${PREFIX}/lib/dovecot/pop3 \ diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile index e10d113e301d..4f770b4b9a59 100644 --- a/mail/dovecot2-pigeonhole/Makefile +++ b/mail/dovecot2-pigeonhole/Makefile @@ -25,7 +25,6 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} \ --docdir=${DOCSDIR} \ --with-dovecot="${LOCALBASE}/lib/dovecot" -CONFIGURE_ENV= LDFLAGS='${LDFLAGS}' LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/dovecot diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index c5d4c4700954..ccd66624a2cd 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -36,8 +36,8 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/dovecot .if defined(NOPORTDOCS) diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 76c335d22b47..8b7d4abdb717 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -81,10 +81,10 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes #CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= ${PTHREAD_CFLAGS} .ifdef(GDBS) CFLAGS+= -g -DDEBUG diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile index 3a801dff6f51..6f850c82db9d 100644 --- a/mail/elmo-devel/Makefile +++ b/mail/elmo-devel/Makefile @@ -25,10 +25,8 @@ USE_PERL5_RUN= yes LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes MAN1= elmo.1 elmoconf.pl.1 diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile index 32b4546952dc..65e0b21d024b 100644 --- a/mail/elmo/Makefile +++ b/mail/elmo/Makefile @@ -24,10 +24,8 @@ USE_PERL5_RUN= yes LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_JOBS_SAFE= yes MAN1= elmo.1 elmoconf.pl.1 diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile index 50db0d96bd40..86e56fdd08ff 100644 --- a/mail/esmtp/Makefile +++ b/mail/esmtp/Makefile @@ -21,7 +21,6 @@ USE_BZIP2= yes USE_OPENSSL= yes USE_BISON= build GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= esmtp.1 MAN5= esmtprc.5 @@ -30,8 +29,8 @@ PLIST_FILES= bin/esmtp etc/esmtprc.sample SUB_FILES= pkg-message -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} post-patch: .for file in ${PORTNAME}.1 diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index d9459c32e264..74c51155689a 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -27,8 +27,8 @@ USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --with-static-ldap=no \ --with-libdb=${LOCALBASE} @@ -54,7 +54,7 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif .if ${ARCH} == "amd64" -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +CFLAGS+= -fPIC .endif .if exists(${LOCALBASE}/include/mapi.h) diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile index 896d4031f61b..c9d52b571e0a 100644 --- a/mail/evolution-mapi/Makefile +++ b/mail/evolution-mapi/Makefile @@ -28,8 +28,8 @@ USE_GMAKE= yes USE_GNOME= evolutiondataserver USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib EVO_VERSION= 2.32 EDS_VERSION= 1.2 diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 6bc63ffda7d7..7c185060bd13 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -38,8 +38,8 @@ CONFIGURE_ARGS= --enable-nss=yes \ --enable-mono=no \ --disable-nm \ --with-sub-version=" FreeBSD GNOME Team Port" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= apps_evolution_addressbook.schemas \ apps-evolution-attachment-reminder.schemas \ diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 370fe742f707..d247328c5a83 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -38,8 +38,8 @@ WITH_AUDIO= # none PLIST_SUB+= X11="" USE_GNOME= gnomehack gtk12 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I../compface -I${LOCALBASE}/include" \ - LDFLAGS="-L../compface -L${LOCALBASE}/lib" +CPPFLAGS+= -I../compface -I${LOCALBASE}/include +LDFLAGS+= -L../compface -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-imap --enable-pop \ --enable-name-unknown --with-spooldir=/var/mail \ --with-facedir=${DATADIR} diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 325da4eb505c..2bbfbacb4918 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -40,7 +40,7 @@ USE_OPENSSL= yes CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ --with-hesiod=no --enable-fallback=no PYTHON=: # bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV: -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= ${CONFIGURE_ENV} MAN1= fetchmail.1 MLINKS= fetchmail.1 fetchmailconf.1 diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile index d556cc5f8c57..827f9890a454 100644 --- a/mail/filtermail/Makefile +++ b/mail/filtermail/Makefile @@ -33,13 +33,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BISON= build USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= filtermail.1 MAN5= filtermailex.5 filtermailrc.5 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/filtermail diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index 9600b021f80a..e280b4299c27 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -21,8 +21,8 @@ USE_GNOME= glib12 USE_ICONV= yes GNU_CONFIGURE= yes CFLAGS+= -L${LOCALBASE}/lib # req'd to find iconv -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS= confexecdir=${PREFIX}/etc USE_LDCONFIG= yes diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile index b6b9d9280bcb..8ebaec5f2814 100644 --- a/mail/gmime2/Makefile +++ b/mail/gmime2/Makefile @@ -26,8 +26,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \ --with-html-dir=${PREFIX}/share/doc \ --enable-mono=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LATEST_LINK?= ${PORTNAME}2 diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile index 8f2a2059517c..aed9f3d0873b 100644 --- a/mail/gmime24/Makefile +++ b/mail/gmime24/Makefile @@ -27,8 +27,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --enable-mono=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LATEST_LINK?= ${PORTNAME}24 diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile index 1178602007f7..310363ac92f5 100644 --- a/mail/gnubiff/Makefile +++ b/mail/gnubiff/Makefile @@ -20,8 +20,8 @@ USE_GNOME= intlhack libglade2 esound USE_GMAKE= yes USE_FAM= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib # CXXFLAGS needed to work round issue with gcc and openssl 0.9.8a # /usr/local/include/openssl/sha.h:173: error: ISO C++ does not support `long long' diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile index 7f03f4adfb3e..8d67977b20b5 100644 --- a/mail/heirloom-mailx/Makefile +++ b/mail/heirloom-mailx/Makefile @@ -37,8 +37,8 @@ PLIST_FILES= bin/${PORTNAME} \ "etc/nail.rc.default" \ "@exec [ -f %B/nail.rc ] || ${CP} %B/%f %B/nail.rc" -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile index 7d069715d277..8161083017d4 100644 --- a/mail/imapfilter/Makefile +++ b/mail/imapfilter/Makefile @@ -19,8 +19,8 @@ USE_LUA= 5.1 USE_OPENSSL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -d ${PREFIX} -s ${DATADIR} -CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR} -LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR} +CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} +LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} MAN1= imapfilter.1 MAN5= imapfilter_config.5 diff --git a/mail/isync/Makefile b/mail/isync/Makefile index b3263eb00eb8..d88c6a9b90c8 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -18,16 +18,14 @@ USE_OPENSSL= yes USE_BDB= 42+ MAKE_JOBS_SAFE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - LICENSE= GPLv2 MAN1= isync.1 mbsync.1 mdconvert.1 PORTDOCS= AUTHORS ChangeLog NEWS README TODO PLIST_FILES= bin/get-cert bin/isync bin/mbsync bin/mdconvert -CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${OPENSSLINC} -LDFLAGS= -L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto +CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${OPENSSLINC} +LDFLAGS+= -L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto post-patch: @${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in diff --git a/mail/kavmilter/Makefile b/mail/kavmilter/Makefile index 41302ee0c8e0..648ce971dfa2 100644 --- a/mail/kavmilter/Makefile +++ b/mail/kavmilter/Makefile @@ -23,10 +23,8 @@ USE_BZIP2= yes MAN5= kavmilter.5 MAN8= kavmilter.8 -CPPFLAGS= ${PTHREAD_CFLAGS} -LDFLAGS= ${PTHREAD_LIBS} -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} post-install: ${STRIP_CMD} ${PREFIX}/libexec/kavmilter diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index a7bdd9b4b2fc..fdff6ffd861e 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -21,10 +21,10 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include # require-all-recipients (implied by enable-all) is required for Balsa CONFIGURE_ARGS= --enable-all --disable-isoc diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index eaa58560b38c..8eb0fd201b83 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -29,8 +29,6 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" - OPTIONS= GNUTLS "Enable gnuTLS support" off \ IPV6 "Enable ipv6 support." on diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile index 8ebc40c283e8..17f9500c9186 100644 --- a/mail/libmapi/Makefile +++ b/mail/libmapi/Makefile @@ -32,8 +32,8 @@ USE_GNOME= pkgconfig USE_PYTHON= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-samba=${LOCALBASE} OPTIONS= BOOST "Enable libmapi++ (needs boost)" yes \ diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile index 50af3d027ac5..44de20efe8bb 100644 --- a/mail/libvmime/Makefile +++ b/mail/libvmime/Makefile @@ -32,7 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-debug .endif -CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" \ LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls" DOCSDIR= ${PREFIX}/share/doc/vmime diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile index d230d03204ae..c87c585c1e5b 100644 --- a/mail/lmtpd/Makefile +++ b/mail/lmtpd/Makefile @@ -86,7 +86,7 @@ CONFIGURE_ARGS+= --without-db3 --without-db4 .endif GNU_CONFIGURE= YES -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" +CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --without-perl MAN8= lmtpd.8 diff --git a/mail/lurker/Makefile b/mail/lurker/Makefile index 3917a4756cc2..f51eabebba18 100644 --- a/mail/lurker/Makefile +++ b/mail/lurker/Makefile @@ -22,8 +22,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING MIMELIB_VERSION= 3.1.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 CONFIGURE_ARGS= --with-mimelib-local \ --with-default-www-dir=${PREFIX}/www/lurker \ --with-cgi-bin-dir=${PREFIX}/www/lurker diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index 40fbef072f7c..68c74b4db88f 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -23,8 +23,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_GNOME= gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2 -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib JB_CONF_ARGS= cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${PREFIX}" JB_CONF_ENV= jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}" GCONF_SCHEMAS= mail-notification.schemas diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index fc9c0a39ead3..af934623fc05 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -31,7 +31,6 @@ USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-syslog=1 \ --enable-use-flock=1 \ --with-etcdir="${PREFIX}/etc" \ diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile index ccf1d43ea77d..9bbffa30cd76 100644 --- a/mail/mairix/Makefile +++ b/mail/mairix/Makefile @@ -16,7 +16,6 @@ COMMENT= Indexing and searching in Maildir, MH or mbox folders USE_GMAKE= yes HAS_CONFIGURE= yes USE_BISON= build -CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" MAN1= mairix.1 MAN5= mairixrc.5 diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile index fe1ac3cceb36..13d460a787eb 100644 --- a/mail/mboxgrep/Makefile +++ b/mail/mboxgrep/Makefile @@ -19,7 +19,8 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre .endif GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include USE_OPENSSL= yes MAN1= mboxgrep.1 diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index eeb0b62519d2..1a58de932bdd 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -81,7 +81,7 @@ LIBS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=mailnull --with-libmilter=${MILTERBASE} \ --enable-dnsrbl --with-thread-safe-resolver -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LIBS="${LIBS} " +CONFIGURE_ENV+= LIBS="${LIBS}" ALL_TARGET= milter-greylist SUB_FILES+= pkg-message diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile index 94b9096b8fae..fde2d8b1c3e5 100644 --- a/mail/mmc/Makefile +++ b/mail/mmc/Makefile @@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//} USE_GNOME= gnomehack gnomelibs gnomeprefix GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -fpermissive diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile index 40fb7afae3f5..0d96f082c4bb 100644 --- a/mail/mmr/Makefile +++ b/mail/mmr/Makefile @@ -30,7 +30,7 @@ CXXFLAGS+= -DTHREADMAIL \ -DMAILPATH=\"/var/mail\" \ -DMAILER=\"/usr/sbin/sendmail\ -t\" \ -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -liconv -lcurses -lmd +LDFLAGS+= -L${LOCALBASE}/lib -liconv -lcurses -lmd post-patch: @${REINPLACE_CMD} -e 's|md5/libmd5.a||g' ${WRKSRC}/Makefile diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 7bac1dc53893..92f0a6fe37fe 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -160,7 +160,7 @@ DOCSDIR?= ${PREFIX}/share/doc/mutt EXAMPLESDIR?= ${PREFIX}/share/examples/mutt DATADIR?= ${PREFIX}/share/mutt LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \ --enable-external-dotlock --enable-pop --enable-imap \ diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 015c1a5f3b6d..9cf65bd3e9d7 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -96,7 +96,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} GNU_CONFIGURE= yes USE_AUTOTOOLS= automake autoconf LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \ --with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \ --with-sharedir=${PREFIX}/share/mutt \ diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index 015c1a5f3b6d..9cf65bd3e9d7 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -96,7 +96,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} GNU_CONFIGURE= yes USE_AUTOTOOLS= automake autoconf LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \ --with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \ --with-sharedir=${PREFIX}/share/mutt \ diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index f1c8933731b0..e0be12b17f86 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -27,7 +27,8 @@ MANCOMPRESSED= no USE_AUTOTOOLS= libtool USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3 +CONFIGURE_ENV= BDB_LIB=db3 +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= DOCSDIR=${DOCSDIR} CONFIGURE_ARGS+=--disable-daemon-map --localstatedir=/var diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile index 66c66156acf2..f7f9589360ab 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -16,7 +16,7 @@ COMMENT= A console-based tool for handling Postfix 1, Postfix 2 and Exim queues USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} MAN1= pfqueue.1 MAN5= pfqueue.conf.5 diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile index bc5376c363fc..e70b859f40fd 100644 --- a/mail/pop3lite/Makefile +++ b/mail/pop3lite/Makefile @@ -19,8 +19,8 @@ USE_GNOME= glib12 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN5= pop3lite.conf.5 MAN8= pop3lite.8 diff --git a/mail/popular/Makefile b/mail/popular/Makefile index 7fd6438670ae..86ba1e7d404e 100644 --- a/mail/popular/Makefile +++ b/mail/popular/Makefile @@ -24,7 +24,8 @@ USE_PERL5= yes PDM_MODULES= any master CONFIGURE_ARGS= --without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/popular \ --enable-ssl --with-pdm="${PDM_MODULES}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= pcheckd.sh pproxy.sh pserv.sh 0ringd.sh diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile index 32ea6406da32..7439092c9ec3 100644 --- a/mail/postfix-gps/Makefile +++ b/mail/postfix-gps/Makefile @@ -29,9 +29,9 @@ WRKSRC= ${WRKDIR}/release-${PORTVERSION} USE_AUTOTOOLS= automake autoconf AUTOMAKE_ARGS= --add-missing CONFIGURE_ARGS= --bindir=${PREFIX}/libexec --includedir=${PREFIX}/include -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +CXXFLAGS+= -I${LOCALBASE}/include pre-configure: @cd ${WRKSRC} && ${ACLOCAL} diff --git a/mail/qsf/Makefile b/mail/qsf/Makefile index 231909072fac..8387e0e8c7c2 100644 --- a/mail/qsf/Makefile +++ b/mail/qsf/Makefile @@ -20,13 +20,12 @@ OPTIONS= GDBM "GDBM support" off \ USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= qsf.1 PLIST_FILES= bin/qsf -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/mail/rabl_client/Makefile b/mail/rabl_client/Makefile index 6a6426928e44..e00b2474c33c 100644 --- a/mail/rabl_client/Makefile +++ b/mail/rabl_client/Makefile @@ -16,7 +16,7 @@ COMMENT= Reactive Autonomous Blackhole List client GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --prefix=${PREFIX} \ --localstatedir=${VAR_DIR} diff --git a/mail/rabl_server/Makefile b/mail/rabl_server/Makefile index dc3dbc0c0193..c4ccd4f01aff 100644 --- a/mail/rabl_server/Makefile +++ b/mail/rabl_server/Makefile @@ -18,7 +18,7 @@ COMMENT= Reactive Autonomous Blackhole List server GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= CHANGE README RELEASE.NOTES diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile index 659619b33c16..c7a7a8402ee7 100644 --- a/mail/rmilter/Makefile +++ b/mail/rmilter/Makefile @@ -17,8 +17,8 @@ PLIST_FILES= sbin/rmilter etc/rc.d/rmilter.sh etc/rmilter.conf.sample HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib WITH_SENDMAIL_BASE= yes diff --git a/mail/sccmilter/Makefile b/mail/sccmilter/Makefile index e804d74ec148..35ef959f74e0 100644 --- a/mail/sccmilter/Makefile +++ b/mail/sccmilter/Makefile @@ -25,17 +25,14 @@ USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME} MAN5= sccmilter.conf.5 scchosts.5 sccusers.5 MAN8= sccmilter.8 -CPPFLAGS= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --with-debug diff --git a/mail/sendmail/bsd.milter.mk b/mail/sendmail/bsd.milter.mk index b89f43053a84..277a01a4036e 100644 --- a/mail/sendmail/bsd.milter.mk +++ b/mail/sendmail/bsd.milter.mk @@ -93,14 +93,7 @@ MILTERLIB= -rpath=${MILTERRPATH} .endif .if !defined(WITHOUT_MILTER_LDFLAGS) -.if defined(LDFLAGS) LDFLAGS+=${MILTERLIB} -.else -LDFLAGS=${MILTERLIB} -.endif .endif -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -MAKE_ENV+= LDFLAGS="${LDFLAGS}" - # eof diff --git a/mail/smtpmail/Makefile b/mail/smtpmail/Makefile index 269a7a3b5787..c8a8d7dcc78a 100644 --- a/mail/smtpmail/Makefile +++ b/mail/smtpmail/Makefile @@ -15,8 +15,8 @@ MAINTAINER= mnag@FreeBSD.org COMMENT= Tool to send e-mail via a remote smtp server GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include PLIST_FILES= bin/smtpmail diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index d8bb78d5b799..8ceb16c9d18c 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -68,7 +68,6 @@ PORTDOCS= AUTHORS ChangeLog NEWS README TODO USE_RC_SUBR= spamass-milter GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" SUB_FILES= pkg-message diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile index 960e7db19838..616f42c06e07 100644 --- a/mail/spamprobe/Makefile +++ b/mail/spamprobe/Makefile @@ -22,7 +22,6 @@ MAINTAINER= stefan@FreeBSD.org COMMENT= Spam detector using Bayesian analysis of word counts GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-default-8bit MAN1= spamprobe.1 diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 7df3536704ca..0a826fdd0fec 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -14,8 +14,8 @@ MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}" \ - CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}" +CFLAGS:= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//} +CXXFLAGS:= -I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//} BUILD_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 9225e945602f..8928ed784570 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -26,9 +26,9 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes # Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it) -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ |