diff options
29 files changed, 90 insertions, 94 deletions
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 43c990446d8..5ba7fcd6d5b 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/05/09 06:48:40 snj Exp $ +# $NetBSD: Makefile,v 1.29 2004/07/24 22:45:14 recht Exp $ # DISTNAME= gtksql-0.3 @@ -17,7 +17,7 @@ USE_BUILDLINK3= yes USE_X11BASE= # defined MAKE_ENV+= MCFLAGS="${CFLAGS}" -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile index c0e143d870d..45af9b42e90 100644 --- a/databases/gtranscript/Makefile +++ b/databases/gtranscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/04/27 02:04:06 snj Exp $ +# $NetBSD: Makefile,v 1.25 2004/07/24 22:45:14 recht Exp $ # DISTNAME= gtranscript-0.0.1 @@ -23,6 +23,6 @@ USE_X11BASE= YES #CPPFLAGS+= -I${LOCALBASE}/include # <postgresql/*.h> -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../x11/gnome-core/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile index a2804588f6d..3163e2da011 100644 --- a/databases/guile-pg/Makefile +++ b/databases/guile-pg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/05/03 15:58:55 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2004/07/24 22:45:15 recht Exp $ # DISTNAME= guile-pg-0.07 @@ -10,16 +10,14 @@ MAINTAINER= cjones@NetBSD.org HOMEPAGE= http://guile-pg.sourceforge.net/ COMMENT= PostgreSQL interface for Guile -DEPENDS+= postgresql-lib>=7.3.1:../../databases/postgresql-lib - USE_BUILDLINK3= YES USE_LIBTOOL= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql +CONFIGURE_ARGS+= --with-libpq-includes=${PGSQL_PREFIX}/include/postgresql INFO_FILES= guile-pg.info -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../lang/guile14/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/libgda-postgres/Makefile b/databases/libgda-postgres/Makefile index 3b6589eba3c..b5f33558728 100644 --- a/databases/libgda-postgres/Makefile +++ b/databases/libgda-postgres/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/05/06 11:17:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/07/24 22:45:15 recht Exp $ # LIBGDA_PROVIDER= postgres .include "../../databases/libgda/Makefile.common" -CONFIGURE_ARGS+= --with-postgres=${BUILDLINK_PREFIX.postgresql-lib} +CONFIGURE_ARGS+= --with-postgres=${PGSQL_PREFIX} -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile index fb9dae47e24..87c14bbf745 100644 --- a/databases/libpqxx/Makefile +++ b/databases/libpqxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/05/08 05:25:12 snj Exp $ +# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $ # .include "../../databases/libpqxx/Makefile.common" @@ -15,12 +15,11 @@ USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE+= libpqxx.pc.in GNU_CONFIGURE= yes -PG_PREFIX= ${BUILDLINK_PREFIX.postgresql-lib} -CONFIGURE_ARGS+= --with-postgres-lib=${PG_PREFIX}/lib -CONFIGURE_ARGS+= --with-postgres-include=${PG_PREFIX}/include/postgresql +CONFIGURE_ARGS+= --with-postgres-lib=${PGSQL_PREFIX}/lib +CONFIGURE_ARGS+= --with-postgres-include=${PGSQL_PREFIX}/include/postgresql # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE} -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile index 63332294eb9..a9852952d64 100644 --- a/databases/p5-DBD-postgresql/Makefile +++ b/databases/p5-DBD-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:36 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2004/07/24 22:45:15 recht Exp $ # VER= 1.22 @@ -21,12 +21,12 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/DBD/Pg/.packlist PGUSER?= pgsql PGPREFIX= ${PREFIX}/${PGUSER} -POSTGRES_INCLUDE= ${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql -POSTGRES_LIB= ${BUILDLINK_PREFIX.postgresql-lib}/lib +POSTGRES_INCLUDE= ${PGSQL_PREFIX}/include/postgresql +POSTGRES_LIB= ${PGSQL_PREFIX}/lib MAKE_ENV+= POSTGRES_INCLUDE="${POSTGRES_INCLUDE}" MAKE_ENV+= POSTGRES_LIB="${POSTGRES_LIB}" .include "../../databases/p5-DBI/buildlink3.mk" -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../lang/perl5/module.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-postgresql/Makefile b/databases/p5-postgresql/Makefile index 4a15d7a92c4..d57a2b1e99d 100644 --- a/databases/p5-postgresql/Makefile +++ b/databases/p5-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/27 02:27:36 snj Exp $ +# $NetBSD: Makefile,v 1.14 2004/07/24 22:45:15 recht Exp $ DISTNAME= pgsql_perl5-1.9.0 PKGNAME= p5-postgresql-1.9.0 @@ -17,8 +17,8 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist # Until the source catches up to the current Perl API, we need PERL_POLLUTE # to look like an older perl. MAKE_PARAMS= DEFINE="-DPERL_POLLUTE=1" -MAKE_ENV+= POSTGRES_HOME="${BUILDLINK_PREFIX.postgresql-lib}" +MAKE_ENV+= POSTGRES_HOME=${PGSQL_PREFIX:Q} -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../lang/perl5/module.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile index 17df39e38e7..59315f2e0e7 100644 --- a/databases/php4-pgsql/Makefile +++ b/databases/php4-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/06 19:52:01 jdolecek Exp $ +# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $ MODNAME= pgsql PKGREVISION= # empty @@ -9,7 +9,7 @@ USE_BUILDLINK3= YES .include "../../www/php4/Makefile.module" -CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.postgresql-lib} +CONFIGURE_ARGS+= --with-${MODNAME}=shared,${PGSQL_PREFIX} -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile index 7a301467de3..89acdf0b50a 100644 --- a/databases/py-PgSQL/Makefile +++ b/databases/py-PgSQL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/07/22 19:30:35 recht Exp $ +# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $ # DISTNAME= pyPgSQL-2.4 @@ -20,5 +20,5 @@ PY_PATCHPLIST= YES .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../time/py-mxDateTime/buildlink3.mk" -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index ca28730e112..d4897325e6f 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/07/22 09:16:01 recht Exp $ +# $NetBSD: Makefile,v 1.34 2004/07/24 22:45:15 recht Exp $ PKGNAME= ${PYPKGPREFIX}-postgresql-3.3 PKGREVISION= 3 @@ -32,8 +32,8 @@ post-install: ${INSTALL_DATA} $${file} ${DOCDIR}/tutorial; \ done -.include "../postgresql-lib/buildlink3.mk" .include "../../time/py-mxDateTime/buildlink3.mk" .include "../../lang/python/extension.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index d3cc18edc8b..8cbcca5feb7 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/07/22 18:00:37 drochner Exp $ +# $NetBSD: Makefile,v 1.15 2004/07/24 22:45:15 recht Exp $ # DISTNAME= psycopg-1.1.14 @@ -13,16 +13,16 @@ COMMENT= PostgreSQL database adapter for Python GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-python=${PYTHONBIN} CONFIGURE_ARGS+= \ - --with-postgres-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql\ - --with-postgres-libraries=${BUILDLINK_PREFIX.postgresql-lib}/lib + --with-postgres-includes=${PGSQL_PREFIX}/include/postgresql\ + --with-postgres-libraries=${PGSQL_PREFIX}/lib ALL_TARGET= default USE_BUILDLINK3= yes PYTHON_VERSIONS_ACCEPTED= 23pth 22pth 21pth PY_PATCHPLIST= yes -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../time/py-mxDateTime/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/ruby-postgresql/Makefile b/databases/ruby-postgresql/Makefile index 4c52e2d8327..8c895224dad 100644 --- a/databases/ruby-postgresql/Makefile +++ b/databases/ruby-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/04/27 05:44:22 snj Exp $ +# $NetBSD: Makefile,v 1.15 2004/07/24 22:45:15 recht Exp $ DISTNAME= ruby-postgres-${VERSION} PKGNAME= ${RUBY_PKGNAMEPREFIX}postgresql-${VERSION} @@ -15,8 +15,8 @@ USE_BUILDLINK3= yes VERSION= 0.7.1 DIST_SUBDIR= ruby USE_RUBY_EXTCONF= yes -CONFIGURE_ARGS+= --with-pgsql-include-dir=${PREFIX}/include/postgresql \ - --with-pgsql-lib-dir=${PREFIX}/lib +CONFIGURE_ARGS+= --with-pgsql-include-dir=${PGSQL_PREFIX}/include/postgresql \ + --with-pgsql-lib-dir=${PGSQL_PREFIX}/lib INSTALL_TARGET= site-install DOC= README README.ja doc/postgres.html doc/postgres.ja.html @@ -42,7 +42,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/sample/$f ${RUBY_EXAMPLESDIR}/postgresql .endfor -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../lang/ruby-base/Makefile.common" .include "../../lang/ruby-base/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile index 05b7a357252..a61e8e9822e 100644 --- a/databases/ruby-vapor/Makefile +++ b/databases/ruby-vapor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/05/11 04:40:59 snj Exp $ +# $NetBSD: Makefile,v 1.5 2004/07/24 22:45:15 recht Exp $ DISTNAME= vapor-0.7.0 PKGNAME= ${RUBY_PKGNAMEPREFIX}${DISTNAME} @@ -22,6 +22,6 @@ post-install: ${CP} -R ${WRKSRC}/doc ${RUBY_DOCDIR}/vapor ${LN} -s ${RUBY_DOCDIR}/vapor/examples ${RUBY_EXAMPLESDIR}/vapor -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../lang/ruby-base/Makefile.common" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 0176d8ae9af..6b15837efd5 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/04/15 10:44:53 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/07/24 22:45:15 recht Exp $ DISTNAME= sqlrelay-0.33.1 CATEGORIES= databases @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_DIR} .endif .if defined(SQLRELAY.postgresql) && ${SQLRELAY.postgresql} == "YES" -. include "../../databases/postgresql-lib/buildlink3.mk" +. include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-postgresql=${BUILDLINK_DIR} .endif diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile index ce5e463ce94..bc78b8f4593 100644 --- a/mail/courier-authpgsql/Makefile +++ b/mail/courier-authpgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/14 21:43:48 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $ PKGNAME= courier-authpgsql-${BASE_VERS} COMMENT= Courier PostgreSQL authentication module @@ -11,8 +11,8 @@ USE_PKGINSTALL= yes INSTALL_EXTRA_TMPL= ${.CURDIR}/../courier-auth/INSTALL CONFIGURE_ARGS+= --with-authpgsql -CONFIGURE_ARGS+= --with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql -CONFIGURE_ARGS+= --with-pgsql-libs=${BUILDLINK_PREFIX.postgresql-lib}/lib +CONFIGURE_ARGS+= --with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql +CONFIGURE_ARGS+= --with-pgsql-libs=${PGSQL_PREFIX}/lib GEN_FILES= authpgsqlrc FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} @@ -23,7 +23,7 @@ CONF_FILES_PERMS+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} \ ${ROOT_USER} ${ROOT_GROUP} 0600 .endfor -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" post-build: cd ${WRKSRC}/authlib; \ diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 4bb70e2f363..4c1a972d39d 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/07/14 18:09:00 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2004/07/24 22:45:15 recht Exp $ DISTNAME= dovecot-0.99.10.7 CATEGORIES= mail @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --with-mysql .if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss]) CONFIGURE_ARGS+= --with-pgsql CPPFLAGS= -I${BUILDLINK_DIR}/include/pgsql -. include "../../databases/postgresql-lib/buildlink3.mk" +. include "../../mk/pgsql.buildlink3.mk" .endif .if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index bead532fe44..97f848f12b0 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/10 03:08:32 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $ DISTNAME= exim-3.36 PKGREVISION= 2 @@ -59,11 +59,11 @@ MAKE_ENV+= LOOKUP_MYSQL=YES . include "../../databases/mysql-client/buildlink3.mk" .endif .if defined(EXIM_DB.pgsql) && ${EXIM_DB.pgsql} == "YES" -LOOKUP_INCLUDE+= -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql -LOOKUP_LIBS+= -L${BUILDLINK_PREFIX.postgresql-lib}/lib -LOOKUP_LIBS+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq +LOOKUP_INCLUDE+= -I${PGSQL_PREFIX}/include/postgresql +LOOKUP_LIBS+= -L${PGSQL_PREFIX}/lib +LOOKUP_LIBS+= -Wl,${RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq MAKE_ENV+= LOOKUP_PGSQL=YES -. include "../../databases/postgresql-lib/buildlink3.mk" +. include "../../mk/pgsql.buildlink3.mk" .endif # buildlink3 decides which libdb to use on this platform. diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 204fc6feb67..026aba7e08b 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/07/21 22:58:10 schmonz Exp $ +# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $ # .include "../../mail/ezmlm/Makefile.common" @@ -49,10 +49,10 @@ post-configure: .endif .if !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS]) -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" post-configure: - ${ECHO} -I${BUILDLINK_PREFIX.postgresql-lib}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc - ${ECHO} -L${BUILDLINK_PREFIX.postgresql-lib}/lib -Wl,-R${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld + ${ECHO} -I${PGSQL_PREFIX}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc + ${ECHO} -L${PGSQL_PREFIX}/lib -Wl,-R${PGSQL_PREFIX}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pgsql .endif diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 626df4348f0..a4951caad9b 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/07/21 23:30:16 schmonz Exp $ +# $NetBSD: Makefile,v 1.35 2004/07/24 22:45:15 recht Exp $ DISTNAME= postfix-2.2-20040628 CATEGORIES= mail @@ -98,14 +98,14 @@ AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ .endif ## .if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES" -## . include "../../databases/postgresql-lib/buildlink3.mk" +## . include "../../mk/pgsql.buildlink3.mk" ## . include "../../security/openssl/buildlink3.mk" ## PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch ## PATCH_SITES+= http://www.mat.cc/postfix/ ## PATCH_DIST_STRIP= -p1 ## -## CCARGS+= -DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql -## AUXLIBS+= -L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \ +## CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql +## AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ## -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt ## .endif diff --git a/mail/postfix/Makefile.options b/mail/postfix/Makefile.options index b7efb2bb0db..a871cc437de 100644 --- a/mail/postfix/Makefile.options +++ b/mail/postfix/Makefile.options @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.options,v 1.3 2004/07/23 15:00:29 jlam Exp $ +# $NetBSD: Makefile.options,v 1.4 2004/07/24 22:45:15 recht Exp $ # # POSTFIX_ALL_OPTIONS lists all of the currently-supported optional modules # that may be built into Postfix. @@ -89,14 +89,14 @@ AUXLIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ ## ### Support using a PostgreSQL database server for table lookups. ## ### ## .if !empty(_POSTFIX_OPTIONS:Mpgsql) -## . include "../../databases/postgresql-lib/buildlink3.mk" +## . include "../../mk/pgsql.buildlink3.mk" ## . include "../../security/openssl/buildlink3.mk" ## PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch ## PATCH_SITES+= http://www.mat.cc/postfix/ ## PATCH_DIST_STRIP= -p1 ## -## CCARGS+= -DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql -## AUXLIBS+= -L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \ +## CCARGS+= -DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql +## AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ## -L${BUILDLINK_PREFIX.openssl}/lib -lcrypt ## .endif diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index b98147db8b9..17ba4107020 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/22 15:33:35 seb Exp $ +# $NetBSD: Makefile,v 1.7 2004/07/24 22:45:15 recht Exp $ DISTNAME= flow-tools-0.67 CATEGORIES= net @@ -40,8 +40,8 @@ CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} # Postgresql support .if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS]) -.include "../../databases/postgresql-lib/buildlink3.mk" -CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.postgresql-lib} +.include "../../mk/pgsql.buildlink3.mk" +CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} .endif # To avoid providing more patch files we do the following... diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile index 01c78b6e6e6..03a205b5388 100644 --- a/net/netsaint-plugins/Makefile +++ b/net/netsaint-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/05/31 22:13:16 kristerw Exp $ +# $NetBSD: Makefile,v 1.19 2004/07/24 22:45:15 recht Exp $ # DISTNAME= netsaint-plugins-1.2.9-4 @@ -17,8 +17,8 @@ DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh .endif USE_BUILDLINK3= YES -CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.postgresql-lib} -CPPFLAGS+= -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql +CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} +CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql .include "../../net/netsaint-base/Makefile.common" .include "../../mk/bsd.prefs.mk" @@ -27,6 +27,6 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql CONFIGURE_ARGS+= --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc" .endif -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile index 4a1e8db2989..e7ed6a146cd 100644 --- a/net/pure-ftpd/Makefile +++ b/net/pure-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/07/20 22:04:15 recht Exp $ +# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $ DISTNAME= pure-ftpd-1.0.19 CATEGORIES= net @@ -33,7 +33,7 @@ BUILD_DEFS+= PURE_FTPD_USE_MYSQL .endif .if !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss]) -. include "../../databases/postgresql-lib/buildlink3.mk" +. include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-pgsql BUILD_DEFS+= PURE_FTPD_USE_PGSQL .endif diff --git a/net/snort-pgsql/Makefile b/net/snort-pgsql/Makefile index 3becf56497b..355d44eab31 100644 --- a/net/snort-pgsql/Makefile +++ b/net/snort-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/07/01 17:10:22 adrianp Exp $ +# $NetBSD: Makefile,v 1.16 2004/07/24 22:45:15 recht Exp $ .include "../../net/snort/Makefile.common" @@ -14,8 +14,7 @@ FILESDIR= ${PKGDIR}/files PATCHDIR= ${PKGDIR}/patches DISTINFO_FILE= ${PKGDIR}/distinfo -CONFIGURE_ARGS+= --with-postgresql=${BUILDLINK_PREFIX.postgresql-lib} - -.include "../../databases/postgresql-lib/buildlink3.mk" +CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile index 3f1d0e6744f..393ef7b9e9f 100644 --- a/www/ap-aolserver/Makefile +++ b/www/ap-aolserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/05/08 19:48:27 snj Exp $ +# $NetBSD: Makefile,v 1.20 2004/07/24 22:45:16 recht Exp $ # DISTNAME= mod_aolserver-1.1 @@ -17,7 +17,7 @@ USE_BUILDLINK3= YES CONFIGURE_ARGS+= --with-database=postgres CONFIGURE_ARGS+= --with-mm=${BUILDLINK_PREFIX.libmm} -CPPFLAGS+= -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql +CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql CFLAGS+= `${APXS} -q CFLAGS CFLAGS_SHLIB` MESSAGE_SUBST+= PREFIX=${PREFIX} @@ -28,8 +28,8 @@ post-install: ${WRKSRC}/tcl_modules/nsd.ini.sample \ ${PREFIX}/share/examples/mod_aolserver -.include "../../databases/postgresql-lib/buildlink3.mk" .include "../../devel/libmm/buildlink3.mk" .include "../../lang/tcl83/buildlink3.mk" .include "../../www/apache/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile index 78bd28b29d5..770be48d6fc 100644 --- a/www/ap-auth-pgsql/Makefile +++ b/www/ap-auth-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/05/08 19:48:27 snj Exp $ +# $NetBSD: Makefile,v 1.5 2004/07/24 22:45:16 recht Exp $ DISTNAME= mod_auth_pgsql-0.9.12 PKGNAME= ap-auth-pgsql-0.9.12 @@ -15,7 +15,7 @@ USE_BUILDLINK3= YES APACHE_MODULE_NAME= mod_auth_pgsql.so -CPPFLAGS+= -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql +CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql LDFLAGS+= -lpq -lcrypt post-install: @@ -26,5 +26,5 @@ post-install: .include "../../www/apache/module.mk" -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile index 14d1dfd580a..27da9520265 100644 --- a/www/ap-auth-postgresql/Makefile +++ b/www/ap-auth-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/05/08 19:48:27 snj Exp $ +# $NetBSD: Makefile,v 1.22 2004/07/24 22:45:16 recht Exp $ DISTNAME= AuthPG-1.4 PKGNAME= ap-auth-postgresql-1.4 @@ -16,7 +16,7 @@ USE_BUILDLINK3= YES APACHE_MODULE_NAME= mod_auth_pg.so -CPPFLAGS+= -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql +CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql LDFLAGS+= -lpq -lcrypt DOCDIR= ${PREFIX}/share/doc/mod_auth_pg @@ -34,5 +34,5 @@ post-install: .include "../../www/apache/module.mk" -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile index 882876bd983..a5f7222f313 100644 --- a/www/ap2-auth-pgsql/Makefile +++ b/www/ap2-auth-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/06/21 16:06:22 darcy Exp $ +# $NetBSD: Makefile,v 1.2 2004/07/24 22:45:16 recht Exp $ # FreeBSD Id: ports/www/mod_auth_pgsql2/Makefile,v 1.5 2004/02/06 11:21:00 clement Exp DISTNAME= mod_auth_pgsql-2.0.2b1 @@ -19,7 +19,7 @@ APACHE_MODULE_NAME = ap2-auth-pgsql do-build: cd ${WRKSRC} && \ ${APXS} -c -n ${APACHE_MODULE_NAME} \ - -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql \ + -I${PGSQL_PREFIX}/include/postgresql \ -L${LOCALBASE}/lib \ -Wl,${RPATH_FLAG} -Wl,${LOCALBASE}/lib \ -lpq ${DISTNAME:C/-[^-]*$//}.c @@ -30,7 +30,7 @@ do-install: #${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DOCSDIR} .include "../../www/apache2/buildlink3.mk" -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile index 21b23035767..fb70ddd5fcf 100644 --- a/x11/qt3-psql/Makefile +++ b/x11/qt3-psql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/07/06 16:59:55 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2004/07/24 22:45:16 recht Exp $ # .include "../qt3-libs/Makefile.common" @@ -7,7 +7,7 @@ PKGNAME= qt3-psql-${QTVERSION} COMMENT= QT postgresql driver CONFIGURE_ARGS+= -I${QTDIR}/include \ - -I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql/server \ + -I${PGSQL_PREFIX}/include/postgresql/server \ -L${QTDIR}/lib USE_BUILDLINK3= yes @@ -25,5 +25,5 @@ do-install: ${SQLDRVDIR} .include "../../x11/qt3-libs/buildlink3.mk" -.include "../../databases/postgresql-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |