diff options
Diffstat (limited to 'databases')
62 files changed, 91 insertions, 114 deletions
diff --git a/databases/animenfo-client-gtk/Makefile b/databases/animenfo-client-gtk/Makefile index fa40caeeaebf..941461e08e1d 100644 --- a/databases/animenfo-client-gtk/Makefile +++ b/databases/animenfo-client-gtk/Makefile @@ -25,7 +25,6 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include CFLAGS+= ${CPPFLAGS} LDFLAGS+= -L${LOCALBASE}/lib diff --git a/databases/beansdb/Makefile b/databases/beansdb/Makefile index c7c84059367c..5a75d9781daa 100644 --- a/databases/beansdb/Makefile +++ b/databases/beansdb/Makefile @@ -15,8 +15,7 @@ MAINTAINER= qingfeng@douban.com COMMENT= Yet anonther distributed key-value storage system from Douban Inc GNU_CONFIGURE= yes -CFLAGS+= -pthread -MAKE_ENV+= CFLAGS="${CFLAGS}" +CFLAGS+= ${PTHREAD_LIBS} MAN1= beansdb.1 PLIST_FILES= bin/beansdb diff --git a/databases/cego/Makefile b/databases/cego/Makefile index 5a3f74bed414..e52f47389982 100644 --- a/databases/cego/Makefile +++ b/databases/cego/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= lfc.1:${PORTSDIR}/devel/lfc \ lfcxml.1:${PORTSDIR}/devel/lfcxml GNU_CONFIGURE= yes -CPPFLAGS= "-I${LOCALBASE}/include" -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf:env diff --git a/databases/clip/Makefile b/databases/clip/Makefile index f55d312cdb58..af291e56d14e 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -37,8 +37,8 @@ USE_XORG+= x11 xau ice xproto xmu xpm WANT_GNOME= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS= IODBC "iODBC support" on \ UNIXODBC "unixODBC support (not with iODBC)" off \ diff --git a/databases/cyrus-imspd/Makefile b/databases/cyrus-imspd/Makefile index dbe62fa86e5a..ffb7421143f5 100644 --- a/databases/cyrus-imspd/Makefile +++ b/databases/cyrus-imspd/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 GNU_CONFIGURE= YES CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-sasldir=${LOCALBASE} \ --with-sasl=${LOCALBASE} \ diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile index bfdc9513c0aa..ddb8d2162997 100644 --- a/databases/dbtool/Makefile +++ b/databases/dbtool/Makefile @@ -31,8 +31,8 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash LICENSE= GPLv2 GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" \ - CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC} USE_GMAKE= yes REINPLACE_ARGS= -i "" diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile index 16ad45222e3f..e748339292da 100644 --- a/databases/dbview/Makefile +++ b/databases/dbview/Makefile @@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= apps/database/proprietary MAINTAINER= ports@FreeBSD.org COMMENT= View dBase III files -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - MAN1= dbview.1 DOCS= README dBASE diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 7ff4df03b468..5dd1ac5fc4ed 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -39,8 +39,8 @@ CONFIGURE_ARGS= --enable-static \ --enable-gnome-keyring=yes \ --with-openldap=yes \ --with-libdb=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2" diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile index 7ed696633fdb..4ab4bbe4e6a7 100644 --- a/databases/firebird20-server/Makefile +++ b/databases/firebird20-server/Makefile @@ -80,8 +80,7 @@ CLIENT_BIN= gpre isql-fb qli CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .if !defined(NOPORTDOCS) diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile index 1e8bb593e1f9..acb5b5d51877 100644 --- a/databases/firebird21-server/Makefile +++ b/databases/firebird21-server/Makefile @@ -83,8 +83,7 @@ CLIENT_BIN= gpre isql-fb qli CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .if !defined(NOPORTDOCS) diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile index 1a5c37cbaeb9..8be4e9b88a4f 100644 --- a/databases/firebird25-server/Makefile +++ b/databases/firebird25-server/Makefile @@ -41,8 +41,7 @@ CONFIGURE_ARGS= --with-system-editline \ --with-fbsbin=${PREFIX}/sbin \ --with-fbsecure-db=${LOCALSTATEDIR} \ --with-fbudf=${LIBEXECDIR}/UDF -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CFLAGS+= -I${LOCALBASE}/include diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile index d1552893a551..f91b0d48a927 100644 --- a/databases/flamerobin/Makefile +++ b/databases/flamerobin/Makefile @@ -22,7 +22,7 @@ WX_PREMK= yes WX_UNICODE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message MAN1= flamerobin.1 diff --git a/databases/flare/Makefile b/databases/flare/Makefile index 43e21265f64c..b02046962eb0 100644 --- a/databases/flare/Makefile +++ b/databases/flare/Makefile @@ -22,7 +22,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" LDFLAGS=-L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_KQUEUE +LDFLAGS+= -L${LOCALBASE}/lib USE_RC_SUBR= flared flarei SUB_FILES= pkg-message diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index bfb0d40c18f7..1fd7daba933f 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:env libtool CPPFLAGS+= "-I${LOCALBASE}/include" -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-tdsver=${TDS_VER} USE_LDCONFIG= yes diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 6c1aa411ae93..68e768a5a49f 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -21,8 +21,8 @@ USE_ICONV= yes USE_GMAKE= yes GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:env libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-tdsver=${TDS_VER} USE_LDCONFIG= yes diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile index aa2c0de57b2a..c9162c0737ca 100644 --- a/databases/gbib/Makefile +++ b/databases/gbib/Makefile @@ -20,8 +20,8 @@ USE_GNOME= gnomelibs USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile index e77c61f471fa..25d437704198 100644 --- a/databases/gigabase/Makefile +++ b/databases/gigabase/Makefile @@ -17,7 +17,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/databases/glom/Makefile b/databases/glom/Makefile index ebae539e2ae2..76e244d6d9fb 100644 --- a/databases/glom/Makefile +++ b/databases/glom/Makefile @@ -38,8 +38,8 @@ USE_GNOME= gnomedocutils gnomehack gnomeprefix pygnomeextras USE_LDCONFIG= yes USE_PGSQL= yes INSTALLS_OMF= yes -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-postgres-utils=${LOCALBASE}/bin INSTALLS_ICONS= yes diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index 533f999353e1..cda56e1dff01 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -24,8 +24,8 @@ INSTALLS_OMF= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl" +CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include PLIST_SUB= VERSION=${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/gnomedb diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index cad6975eda9f..4bdada294746 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -22,9 +22,9 @@ USE_PYTHON= yes USE_GNOME= pkgconfig USE_GETTEXT= yes CXXFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl USE_AUTOTOOLS= libtool -CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \ --with-python-incdir=${PYTHON_INCLUDEDIR} \ --with-fontconfig-incdir=${LOCALBASE}/include/fontconfig \ @@ -56,8 +56,8 @@ USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-dir=${LOCALBASE} \ --with-mysql-incdir=${LOCALBASE}/include/mysql \ --with-mysql-libdir=${LOCALBASE}/lib/mysql -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" +CPPFLAGS+= -I${LOCALBASE}/include PLIST_SUB+= MYSQL="" .else CONFIGURE_ARGS+= --without-mysql @@ -68,7 +68,8 @@ PLIST_SUB+= MYSQL="@comment " USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgres-incdir=${LOCALBASE}/include/ \ --with-postgres-libdir=${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include PLIST_SUB+= POSTGRESQL="" .else CONFIGURE_ARGS+= --without-postgres diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index b23a9ba4fc4f..3c05b81794bf 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -29,8 +29,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk-doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" +CPPFLAGS+= -I${LOCALBASE}/include PLIST_SUB= VERSION=${PORTVERSION} MAKE_JOBS_UNSAFE=yes diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index b9ba55e4542c..7c25189984d7 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -35,8 +35,8 @@ INSTALLS_OMF= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-bdb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include MAN1= gda-config-tool.1 MAN5= gda-config.5 diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 2c5017a1548f..326f6d889be1 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -32,8 +32,8 @@ USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-bdb --without-sybase -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index 73515678eddc..345beca6b0ff 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -40,8 +40,8 @@ MAKE_JOBS_UNSAFE=yes CONFIGURE_ARGS= --without-oracle \ --disable-crypto \ --enable-introspection=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" +CPPFLAGS+= -I${LOCALBASE}/include .if ${LIBGDA4_SLAVE}=="no" OPTIONS= UI "Build UI tools" on diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 528e2e208cb7..9d0428e60377 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -28,8 +28,8 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= libgnomedb-3.0.schemas diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile index 46fb93d8f58e..6ccaa29fc6a6 100644 --- a/databases/libiodbc/Makefile +++ b/databases/libiodbc/Makefile @@ -19,14 +19,13 @@ CONFLICTS= unixODBC-[0-9]* USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-iodbc-inidir=${ETCDIR} USE_LDCONFIG= yes MAN1= iodbc-config.1 iodbctest.1 iodbctestw.1 -CPPFLAGS= ${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_ -LDFLAGS= ${PTHREAD_LIBS} +CPPFLAGS+= ${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_ +LDFLAGS+= ${PTHREAD_LIBS} .if defined(WITH_GUI) USE_GNOME+= gtk20 diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile index c78b433f42e9..e07959db4eb9 100644 --- a/databases/libzdb/Makefile +++ b/databases/libzdb/Makefile @@ -23,12 +23,11 @@ OPTIONS= MYSQL "Add MySQL support" on \ USE_GNOME= gnomehack USE_GMAKE= yes USE_AUTOTOOLS= libtool -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile index dcb05d89c4b1..033a5f0c1cf4 100644 --- a/databases/luasql-mysql/Makefile +++ b/databases/luasql-mysql/Makefile @@ -28,10 +28,9 @@ LUASQL_DRIVER?= mysql MAKE_ENV+= LUA_DIR=${LUA_SUBDIR} \ LUA_INC=${LUA_INCDIR} \ LUA_LIBDIR=${LUA_LIBDIR} \ - LDFLAGS="-shared" \ LUA_VERSION_NUM="${LUA_VER_STR}0" \ T=${LUASQL_DRIVER} - +LDFLAGS+= -shared CFLAGS+= -fPIC PLIST_SUB+= LUA_MIDLIBDIR=${LUA_MODLIBDIR} diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 8b0fa487b164..d81be537cb58 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -53,9 +53,8 @@ CONFIGURE_ARGS+= --enable-replication LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --enable-sasl CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS= ${CFLAGS} +CPPFLAGS+= ${CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .else CONFIGURE_ARGS+= --disable-sasl .endif diff --git a/databases/memcached12/Makefile b/databases/memcached12/Makefile index 51fcb28530a8..5816403a5d91 100644 --- a/databases/memcached12/Makefile +++ b/databases/memcached12/Makefile @@ -58,7 +58,6 @@ LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --enable-sasl CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .else CONFIGURE_ARGS+= --disable-sasl .endif diff --git a/databases/memcachedb/Makefile b/databases/memcachedb/Makefile index 7c53e8228d01..2a9d24878827 100644 --- a/databases/memcachedb/Makefile +++ b/databases/memcachedb/Makefile @@ -19,9 +19,8 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent CFLAGS= -I"${BDB_INCLUDE_DIR}" CONFIGURE_ARGS= --enable-threads --with-bdb="${LOCALBASE}" \ --with-libevent="${LOCALBASE}" -CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" GNU_CONFIGURE= yes -LDFLAGS= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib" +LDFLAGS+= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib" MCDBDIR?= /var/db/memcachedb USE_BDB= 47+ USE_RC_SUBR= ${PORTNAME} diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile index 82e86ed1d5e5..67926c772184 100644 --- a/databases/memcacheq/Makefile +++ b/databases/memcacheq/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent CFLAGS+= -I"${BDB_INCLUDE_DIR}" LDFLAGS+= -l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib" -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" USE_RC_SUBR= memcacheq USE_BDB= 47+ diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 9f0ad88392f6..70426d0cfd5d 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/databases/my2cego/Makefile b/databases/my2cego/Makefile index 96914b0e273d..1ba9ae39015d 100644 --- a/databases/my2cego/Makefile +++ b/databases/my2cego/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= lfc.1:${PORTSDIR}/devel/lfc \ LICENSE= GPLv2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf:env PLIST_FILES= bin/my2cego diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile index 87f5dd267b7f..f218eeb8ed6a 100644 --- a/databases/mysql-connector-odbc/Makefile +++ b/databases/mysql-connector-odbc/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool libltdl USE_LDCONFIG= yes CFLAGS+= -L${LOCALBASE}/lib -LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-mysql-path=${LOCALBASE} --without-samples \ --disable-gui --enable-test=no diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile index 7b9c947f450a..49163a0aa712 100644 --- a/databases/mysql-proxy/Makefile +++ b/databases/mysql-proxy/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent \ CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}" \ - PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc" +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc" +LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} GNU_CONFIGURE= yes USE_GNOME= pkgconfig USE_ICONV= yes diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile index 09b7682ad02e..35e314d3ee91 100644 --- a/databases/mysql-q4m/Makefile +++ b/databases/mysql-q4m/Makefile @@ -23,8 +23,8 @@ USE_MYSQL= yes WANT_MYSQL_VER?= 51 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql CONFIGURE_ARGS= --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/mysql/plugin" \ --with-mysql="$$(cd ${PORTSDIR}/databases/mysql${MYSQL_VER}-server; ${MAKE} -V WRKSRC)" diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index f34562f5cb37..72960fd1e737 100644 --- a/databases/mysql-workbench51/Makefile +++ b/databases/mysql-workbench51/Makefile @@ -58,8 +58,7 @@ DATADIR= ${PREFIX}/share/mysql-workbench CXXFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} GNU_CONFIGURE= yes -CONFIGURE_ENV= GNOME2_DIR="${LOCALBASE}" LDFLAGS="${LDFLAGS}" LUA_LIBS="-llua" - +CONFIGURE_ENV= GNOME2_DIR="${LOCALBASE}" LUA_LIBS="-llua" USE_MYSQL= client DEFAULT_MYSQL_VER= 51 diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile index 277add22525e..d606c9042469 100644 --- a/databases/mysql2odbc/Makefile +++ b/databases/mysql2odbc/Makefile @@ -38,7 +38,8 @@ CONFIGURE_ARGS= --with-iodbc .endif CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile index 0a788171ac95..7f25f1c41b3e 100644 --- a/databases/mysqlcppapi/Makefile +++ b/databases/mysqlcppapi/Makefile @@ -19,8 +19,8 @@ USE_MYSQL= yes USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-mysql=${LOCALBASE} USE_LDCONFIG= yes diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index cb3d30041e1d..f0ee1805edf0 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -20,7 +20,6 @@ USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-backends="${CONFIGURE_MODULES}" -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= ${PREFIX}/lib/opendbx diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile index c01e0860b6ff..efd47e108232 100644 --- a/databases/p5-BDB/Makefile +++ b/databases/p5-BDB/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense PORTSCOUT= skipv:1.801 CFLAGS+= -I${BDB_INCLUDE_DIR} -MAKE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +LDFLAGS+= ${PTHREAD_LIBS} PERL_CONFIGURE= yes USE_BDB= 43+ diff --git a/databases/pecl-handlersocket/Makefile b/databases/pecl-handlersocket/Makefile index b4a35e23b220..2cc69395fa3f 100644 --- a/databases/pecl-handlersocket/Makefile +++ b/databases/pecl-handlersocket/Makefile @@ -23,7 +23,7 @@ USE_PHP= yes USE_PHPEXT= yes CONFIGURE_ARGS= --with-handlersocket=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} .include <bsd.port.mk> diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile index 4d81683acd6a..6638c412b28e 100644 --- a/databases/pecl-rrd/Makefile +++ b/databases/pecl-rrd/Makefile @@ -18,7 +18,7 @@ COMMENT= PHP bindings to rrd tool system LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib LICENSE= PHP301 diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 0a2fc3c9dd30..7d7fb6da2170 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -23,7 +23,8 @@ USE_GMAKE= yes IGNORE_WITH_PGSQL= 73 74 80 81 82 DEFAULT_PGSQL_VER?= 83 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-wx-version=${USE_WX} USE_GNOME= libxml2 libxslt USE_WX= 2.8 diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile index 5812689e9599..6d7d96dacc6e 100644 --- a/databases/postgresql-tcltk/Makefile +++ b/databases/postgresql-tcltk/Makefile @@ -35,16 +35,13 @@ INCLUDES+= -I${TCL_INCDIR} TCL_INCDIR= ${LOCALBASE}/include/tcl${TCLVERSION} TCLCONFIG= ${LOCALBASE}/lib/tcl${TCLVERSION} MAKE_ENV+= TCL_INCDIR=${TCL_INCDIR} -CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \ - CFLAGS=-DPGTCL_USE_TCLOBJ +CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" +CFLAGS+= -DPGTCL_USE_TCLOBJ .if defined(WITHOUT_X11) WITHOUT_TK= yes .endif -CONFIGURE_ENV+= LIBS="-lm -L${LOCALBASE}/lib -ltcl${TCLVERSION:S/.//}" \ - CFLAGS=-DPGTCL_USE_TCLOBJ - .if defined(WITHOUT_TK) CONFIGURE_ARGS+= --without-tk INCDIRS= ${TCL_INCDIR} diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index ab69ca9e7555..b5dab8d0d2ec 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/lib \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES=${INCLUDES} \ +CONFIGURE_ENV+= INCLUDES=${INCLUDES} \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 99e01933a334..a51c0932ebdf 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/lib \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \ +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 32437f54d3f9..68823aee796a 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -44,8 +44,7 @@ INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - INCLUDES="${INCLUDES}" \ +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 5e702a374a7b..4bb749227a69 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -42,8 +42,7 @@ INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - INCLUDES="${INCLUDES}" \ +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 262423b153d5..deaf9a186029 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -43,8 +43,7 @@ INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - INCLUDES="${INCLUDES}" \ +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 262423b153d5..deaf9a186029 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -43,8 +43,7 @@ INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ - INCLUDES="${INCLUDES}" \ +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index 5ee5c0ff3713..3c928cda398d 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -22,7 +22,8 @@ USE_ICONV= yes USE_GETTEXT= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile index 933b7424f9fa..28c00edf2392 100644 --- a/databases/pxtools/Makefile +++ b/databases/pxtools/Makefile @@ -16,9 +16,8 @@ COMMENT= Collection of tools to work with Paradox databases GNU_CONFIGURE= yes USE_GETTEXT= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' \ diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index b4af52038c7a..076fba711fed 100644 --- a/databases/qdbm/Makefile +++ b/databases/qdbm/Makefile @@ -22,8 +22,8 @@ CONFIGURE_ARGS= --enable-zlib \ --enable-iconv \ --enable-pthread CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" +CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib MAKE_ARGS= RELCFLAGS="${CFLAGS}" \ MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}" .if !defined(NOPORTDOCS) diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index d445468dd39d..4d0b495d8563 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -96,7 +96,6 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \ rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 \ diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile index cf5d21dda3c6..1f9b2223fbef 100644 --- a/databases/rrdtool12/Makefile +++ b/databases/rrdtool12/Makefile @@ -70,7 +70,6 @@ PLIST_SUB+= WITH_PERL="@comment " CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2 LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \ rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \ diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile index a41e8f8c7768..d2c488848886 100644 --- a/databases/sqlcached/Makefile +++ b/databases/sqlcached/Makefile @@ -16,7 +16,7 @@ COMMENT= A cache daemon using SQL for data manipulation LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 -MAKE_ENV+= LDFLAGS=-L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS= -O2 -Wall -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 7a166768d1fb..d2f5a3a21fd9 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -31,6 +31,7 @@ USE_TCL_BUILD= 84+ CONFIGURE_ENV+= TCLSH_CMD="${TCLSH}" \ TCLLIBDIR="${PREFIX}/lib/${PORTNAME}" \ ac_cv_search_pthread_create="" +CPPFLAGS+= -I. -I./src # Use an in-ram database for temporary tables (never,no,yes,always), # which is equivalent of SQLITE_TEMP_STORE=[0,1,2,3] @@ -205,9 +206,6 @@ CONFIGURE_ARGS+= --enable-load-extension CONFIGURE_ARGS+= --disable-load-extension .endif -CONFIGURE_ENV+= CPPFLAGS="-I. -I./src ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -MAKE_ENV+= CPPFLAGS="-I. -I./src ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - .include <bsd.port.pre.mk> .if defined(TCL_VER) && ${TCL_VER} > 8.4 diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index b4f985e2be38..0256d3861650 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= rudiments.1:${PORTSDIR}/devel/rudiments WANT_GNOME= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf libtool -CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} \ - CPPFLAGS="-I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile index 8f1e75874712..0102829a31f4 100644 --- a/databases/tokyotyrant/Makefile +++ b/databases/tokyotyrant/Makefile @@ -27,14 +27,14 @@ MAN8= ttservctl.8 OPTIONS= LUA "Enable LUA support" off -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> .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 .else diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 30ca4b6d4c93..980630af46e1 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -28,8 +28,8 @@ CONFIGURE_ARGS= --with-readline\ --enable-bpel-vad\ --datadir="${PREFIX}"\ --localstatedir="${PREFIX}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib USE_RC_SUBR= virtuoso.sh ONLY_FOR_ARCHS= i386 amd64 USERS= virtuoso |