diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2005-01-31 00:35:55 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2005-01-31 00:35:55 +0000 |
| commit | 34fa6c853efa04ca648d3d4187d4aec40a00fc0d (patch) | |
| tree | 3445b3e9b6e7650fd127ec078394a0d7a8e79076 | |
| parent | Split the postgresql ports into a server and a client part. (diff) | |
Split the postgresql ports into a server and a client part.
All ports depending on postgresql shall use the USE_PGSQL=yes knob
defined in Mk/bsd.ports.mk. Bumping portrevisions where needed.
PR: 75344
Approved by: portmgr@ (kris), ade & sean (mentors)
Notes
Notes:
svn path=/head/; revision=127737
139 files changed, 525 insertions, 724 deletions
@@ -1382,3 +1382,6 @@ editors/ghex2|editors/ghex|2005-01-25|moved to non-versioned directory x11-fm/xfce4-fm-icons||2005-01-26|got obsolete by xfce 4.2 update misc/xfce4-panel-themes||2005-01-26|got obsolete by xfce 4.2 update x11-wm/xfce4-menueditor||2005-01-30|got obsolete since it is now included in xfce4-desktop +databases/postgresql72|2005-01-30|removed, 7.2 branch is retired +databases/postgresql73|2005-01-30|port split into postgresql73-server and -client +databases/postgresql7|2005-01-30|port split into postgresql74-server and -client diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e86a4b629769..4caa47277876 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -364,6 +364,21 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # WITH_MYSQL_VER # - User defined variable to set MySQL version. ## +# USE_PGSQL - Add PostgreSQL client dependency. +# If no version is given (by the maintainer via the port or +# by the user via defined variable), try to find the +# currently installed version. Fall back to default if +# necessary (PostgreSQL-7.4 = 74). +# DEFAULT_PGSQL_VER +# - PostgreSQL default version. Can be overridden within a port. +# Default: 74. +# WANT_PGSQL_VER +# - Maintainer can set an arbitrary version of PostgreSQL by +# using it. +# BROKEN_WITH_PGSQL +# - This variable can be defined if the ports doesn't support +# one or more versions of PostgreSQL. +## # USE_RC_SUBR - If set, the ports startup/shutdown script uses the common # routines found in etc/rc.subr and may need to # depend on the sysutils/rc_subr port. @@ -1689,6 +1704,44 @@ BROKEN= "unknown MySQL version: ${MYSQL_VER}" .endif # Check for correct libs .endif # USE_MYSQL +.if defined(USE_PGSQL) +DEFAULT_PGSQL_VER?= 74 + +# Setting/finding PostgreSQL version we want. +.if defined(WANT_PGSQL_VER) +PGSQL_VER= ${WANT_PGSQL_VER} +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif # WANT_PGSQL_VER + +# And now we are checking if we can use it +.if exists(${PORTSDIR}/databases/postgresql${PGSQL_VER}-client) +.if defined(BROKEN_WITH_PGSQL) +. for VER in ${BROKEN_WITH_PGSQL} +. if (${PGSQL_VER} == "${VER}") +BROKEN= "Doesn't work with PostgreSQL version : ${PGSQL_VER} (Doesn't support PostgresSQL ${BROKEN_WITH_PGSQL})" +. endif +. endfor +.endif # BROKEN_WITH_PGSQL +LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client +.else +BROKEN= "unknown PostgreSQL version: ${PGSQL_VER}" +.endif # Check for correct version +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.endif # USE_PGSQL + +.if defined(USE_XLIB) +LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} +# Add explicit X options to avoid problems with false positives in configure +.if defined(GNU_CONFIGURE) +CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +.endif +.endif + # XXX: (not yet): .if defined(USE_AUTOTOOLS) .include "${PORTSDIR}/Mk/bsd.autotools.mk" # XXX: (not yet): .endif @@ -7,6 +7,25 @@ time you update your ports collection, before attempting any port upgrades. 20050130: + AFFECTS: users of PostgreSQL + AUTHOR: girgen@FreeBSD.org + + Each of the PostgreSQL ports have been split into a server and a + client part. Please use postgresqlNN-server and/or + postgresqlNN-client as needed. Versions currently supported are 7.3, + 7.4 and 8.0. + + To start the PostgreSQL server at boot time, add the following to + /etc/rc.conf: + + postgresql_enable=yes + + The maintainance script is installed in etc/periodic/daily, and is + controlled by a set of new knobs in periodic.conf. Use it for + vacuuming your databases and get daily backups. Note that daily + vacuuming is on by default. See the script for details. + +20050130: AFFECTS: users of net/howl AUTHOR: marcus@FreeBSD.org diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 2025818b2a86..6c19edbd3747 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -69,8 +69,8 @@ WITH_MYSQL= yes .else PLIST_SUB+= MSM='@comment ' .endif -.if exists(${LOCALBASE}/lib/libpq.so) -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +.if exists(${LOCALBASE}/bin/psql) +USE_PGSQL= yes PLIST_SUB+= PGM='' WITH_PGSQL= yes .else diff --git a/databases/Makefile b/databases/Makefile index 8293127d07ab..cebc6d2c1973 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -263,9 +263,12 @@ SUBDIR += postgresql-pltcl SUBDIR += postgresql-relay SUBDIR += postgresql-tcltk - SUBDIR += postgresql7 - SUBDIR += postgresql72 - SUBDIR += postgresql73 + SUBDIR += postgresql73-client + SUBDIR += postgresql73-server + SUBDIR += postgresql74-client + SUBDIR += postgresql74-server + SUBDIR += postgresql80-client + SUBDIR += postgresql80-server SUBDIR += postgresql_autodoc SUBDIR += puredb SUBDIR += pxtools diff --git a/databases/clip/Makefile b/databases/clip/Makefile index 02be281c0b38..46bba382310e 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -60,7 +60,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) || exists(${LOCALBASE}/include/libpq-fe.h) -LIB_DEPENDS+= pq.3:${PORTSDIR}/${PGSQL_PORT} +USE_PGSQL= yes PLIST_SUB+= PGSQL="" .else PLIST_SUB+= PGSQL="@comment " @@ -89,7 +89,6 @@ MAKE_ENV= HOME=${WRKDIR} LANG=C PKGMESSAGE= ${WRKDIR}/pkg-message -PGSQL_PORT?= databases/postgresql7 FIREBIRD_PORT?= databases/firebird BIN2STRIP= bdbf clip clip_bl clip_blank clip_cld clip_conv clip_dbf2txt \ diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/databases/courier-authlib-mysql/Makefile +++ b/databases/courier-authlib-mysql/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/databases/courier-authlib-pgsql/Makefile +++ b/databases/courier-authlib-pgsql/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/databases/courier-authlib-userdb/Makefile +++ b/databases/courier-authlib-userdb/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/databases/courier-authlib-usergdbm/Makefile +++ b/databases/courier-authlib-usergdbm/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile index 5efc2437adcd..5b4aa2114866 100644 --- a/databases/dbconnect/Makefile +++ b/databases/dbconnect/Makefile @@ -40,7 +40,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --enable-pgsql=yes \ --with-pgsql_include=${LOCALBASE}/include \ --with-pgsql_lib=${LOCALBASE}/lib diff --git a/databases/erserver/Makefile b/databases/erserver/Makefile index b9079887243a..fdf84567b500 100644 --- a/databases/erserver/Makefile +++ b/databases/erserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= erserver PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ftp://gborg.postgresql.org/pub/erserver/stable/ DISTNAME= ${PORTNAME}_v${PORTVERSION} @@ -16,10 +16,11 @@ DIST_SUBDIR= postgresql MAINTAINER= kuriyama@FreeBSD.org COMMENT= Trigger-based asynchronous replication system for PostgreSQL +PGSQL_PORT= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-server BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ - ${PGINC}/executor/spi.h:${PORTSDIR}/databases/postgresql7 + ${PGINC}/executor/spi.h:${PGSQL_PORT} RUN_DEPENDS= ${JAVAJARDIR}/log4j.jar:${PORTSDIR}/devel/log4j \ - psql:${PORTSDIR}/databases/postgresql7 + postgres:${PGSQL_PORT} USE_GMAKE= yes GNU_CONFIGURE= yes @@ -33,9 +34,22 @@ MAKE_ARGS= sqldir=${DATADIR} templdir=${DATADIR} docdir=${DOCSDIR} \ libdir=${PREFIX}/lib/postgresql javadir=${JAVAJARDIR} \ siteperldir=${SITE_PERL} -PGINC= ${PREFIX}/include/postgresql/server +DEFAULT_PGSQL_VER?=74 + +.include <bsd.port.pre.mk> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif + +PGINC= ${LOCALBASE}/include/postgresql/server pre-install: ${MKDIR} ${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile index e99fb9e182ed..71e686b21324 100644 --- a/databases/grass-i18n/Makefile +++ b/databases/grass-i18n/Makefile @@ -32,9 +32,8 @@ FILES_TKI18N= tcltkgrass-i18n${EXTRACT_SUFX} FILES_FONTS= grass${PORTVERSION}_i686-pc-linux-i18n-ipafull-gnu_bin${EXTRACT_SUFX} .if defined(WITH_POSTGRES) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \ - odbc.1:${PORTSDIR}/databases/unixODBC +USE_PGSQL= yes +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-postgres \ --with-postgres-includes=${LOCALBASE}/include/postgresql/internal/ \ --with-odbc diff --git a/databases/grass/Makefile b/databases/grass/Makefile index 3f780e5d4b67..d33f0ba13fec 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -7,7 +7,7 @@ PORTNAME= grass PORTVERSION= 5.0.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= databases MASTER_SITES= http://grass.itc.it/grass50/source/ \ @@ -19,7 +19,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}_src MAINTAINER= ports@FreeBSD.org COMMENT= An open source Geographical Information System (GIS) -POSTGRESQL_PORT?= databases/postgresql7 LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -27,7 +26,6 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ fftw.2:${PORTSDIR}/math/fftw \ freetype.9:${PORTSDIR}/print/freetype2 \ gdbm.3:${PORTSDIR}/databases/gdbm \ - pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \ odbc.1:${PORTSDIR}/databases/unixODBC \ lapack.3:${PORTSDIR}/math/lapack BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \ @@ -39,6 +37,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude *CVS* WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} +USE_PGSQL= yes USE_ICONV= yes USE_XLIB= yes USE_GL= yes diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 2441fc0f2329..76b66f1b1343 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -21,7 +21,6 @@ WITH_MYSQL= yes USE_X_PREFIX= yes USE_GTK= yes USE_REINPLACE= yes -POSTGRESQL_PORT?= databases/postgresql7 .include <bsd.port.pre.mk> @@ -33,7 +32,7 @@ LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client .if defined(WITH_PGSQL) || (exists(${LOCALBASE}/lib/libpq.a) \ && !defined(WITHOUT_PGSQL)) HAVE_PGSQL= yes -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes .endif pre-patch: diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index ab19e334c0de..2c1ebc9bb1e1 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -53,8 +53,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_POSTGRESQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +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" diff --git a/databases/hs-hsql/Makefile b/databases/hs-hsql/Makefile index bc82027cc106..fbac06fdb9cf 100644 --- a/databases/hs-hsql/Makefile +++ b/databases/hs-hsql/Makefile @@ -7,6 +7,7 @@ PORTNAME= hsql PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= databases haskell MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= htoolkit @@ -16,10 +17,10 @@ DISTNAME= HSQL-${PORTVERSION} MAINTAINER= haskell@FreeBSD.org COMMENT= Haskell access to SQL -BUILD_DEPENDS= psql:${PORTSDIR}/databases/postgresql7 \ - ghc:${PORTSDIR}/lang/ghc -RUN_DEPENDS= psql:${PORTSDIR}/databases/postgresql7 \ - ghc:${PORTSDIR}/lang/ghc +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc + +USE_PGSQL= yes .if !defined(NOPORTDOCS) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index f767f63b66e8..b0820d7463c7 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -45,7 +45,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= PGSQL="" .else diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index a801be2962ad..9028bea115c0 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -48,11 +48,7 @@ WITH_MYSQL= yes .endif .if exists(${LOCALBASE}/lib/libpq.so.3) -WITH_POSTGRES7= yes -.endif - -.if exists(${LOCALBASE}/lib/libpgeasy.so.2) -WITH_POSTGRES72=yes +WITH_PGSQL= yes .endif .if exists(${LOCALBASE}/lib/libldap.so.2) @@ -92,21 +88,11 @@ CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} PLIST_SUB+= MYSQL:="" .endif -.if !defined(WITHOUT_POSTGRES7) && defined(WITH_POSTGRES7) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} -PLIST_SUB+= POSTGRES:="" -.endif - -.if !defined(WITHOUT_POSTGRES72) && defined(WITH_POSTGRES72) -POSTGRESQL_PORT?= databases/postgresql72 -LIB_DEPENDS+= pgeasy.2:${PORTSDIR}/${POSTGRESQL_PORT} +.if !defined(WITHOUT_PGSQL) && defined(WITH_PGSQL) +USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} PLIST_SUB+= POSTGRES:="" -.endif - -.if !defined(WITH_POSTGRES7) && !defined(WITH_POSTGRES72) +.else PLIST_SUB+= POSTGRES:="@comment " CONFIGURE_ARGS+= --without-postgres .endif @@ -178,11 +164,8 @@ pre-everything:: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." .endif -.if !defined(WITH_POSTGRES7) - @${ECHO_MSG} "You can enable support for Postgres 7.0 databases by defining WITH_POSTGRES7." -.endif -.if !defined(WITH_POSTGRES72) - @${ECHO_MSG} "You can enable support for Postgres 7.2 databases by defining WITH_POSTGRES72." +.if !defined(WITH_PGSQL) + @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL." .endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index a801be2962ad..9028bea115c0 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -48,11 +48,7 @@ WITH_MYSQL= yes .endif .if exists(${LOCALBASE}/lib/libpq.so.3) -WITH_POSTGRES7= yes -.endif - -.if exists(${LOCALBASE}/lib/libpgeasy.so.2) -WITH_POSTGRES72=yes +WITH_PGSQL= yes .endif .if exists(${LOCALBASE}/lib/libldap.so.2) @@ -92,21 +88,11 @@ CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} PLIST_SUB+= MYSQL:="" .endif -.if !defined(WITHOUT_POSTGRES7) && defined(WITH_POSTGRES7) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} -PLIST_SUB+= POSTGRES:="" -.endif - -.if !defined(WITHOUT_POSTGRES72) && defined(WITH_POSTGRES72) -POSTGRESQL_PORT?= databases/postgresql72 -LIB_DEPENDS+= pgeasy.2:${PORTSDIR}/${POSTGRESQL_PORT} +.if !defined(WITHOUT_PGSQL) && defined(WITH_PGSQL) +USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} PLIST_SUB+= POSTGRES:="" -.endif - -.if !defined(WITH_POSTGRES7) && !defined(WITH_POSTGRES72) +.else PLIST_SUB+= POSTGRES:="@comment " CONFIGURE_ARGS+= --without-postgres .endif @@ -178,11 +164,8 @@ pre-everything:: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." .endif -.if !defined(WITH_POSTGRES7) - @${ECHO_MSG} "You can enable support for Postgres 7.0 databases by defining WITH_POSTGRES7." -.endif -.if !defined(WITH_POSTGRES72) - @${ECHO_MSG} "You can enable support for Postgres 7.2 databases by defining WITH_POSTGRES72." +.if !defined(WITH_PGSQL) + @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL." .endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile index 5bb6ca8bc53a..83958486c8b7 100644 --- a/databases/p5-DBD-Pg-13/Makefile +++ b/databases/p5-DBD-Pg-13/Makefile @@ -16,9 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Provides access to PostgreSQL databases through the DBI -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - -POSTGRESQL_PORT?= databases/postgresql7 +USE_PGSQL= yes PERL_CONFIGURE= yes @@ -37,17 +35,8 @@ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI .endif -.if defined(WITH_OLD_LAYOUT) -CONFIGURE_ENV+= POSTGRES_INCLUDE=${LOCALBASE}/include/pgsql \ - POSTGRES_LIB=${LOCALBASE}/lib -.else -.if exists(${LOCALBASE}/pgsql/bin/pg_config) -PG_CONFIG= ${LOCALBASE}/pgsql/bin/pg_config -.else PG_CONFIG= ${LOCALBASE}/bin/pg_config -.endif CONFIGURE_ENV+= POSTGRES_INCLUDE=`${PG_CONFIG} --includedir` \ POSTGRES_LIB=`${PG_CONFIG} --libdir` -.endif .include <bsd.port.post.mk> diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile index 5bb6ca8bc53a..83958486c8b7 100644 --- a/databases/p5-DBD-Pg/Makefile +++ b/databases/p5-DBD-Pg/Makefile @@ -16,9 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Provides access to PostgreSQL databases through the DBI -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - -POSTGRESQL_PORT?= databases/postgresql7 +USE_PGSQL= yes PERL_CONFIGURE= yes @@ -37,17 +35,8 @@ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI .endif -.if defined(WITH_OLD_LAYOUT) -CONFIGURE_ENV+= POSTGRES_INCLUDE=${LOCALBASE}/include/pgsql \ - POSTGRES_LIB=${LOCALBASE}/lib -.else -.if exists(${LOCALBASE}/pgsql/bin/pg_config) -PG_CONFIG= ${LOCALBASE}/pgsql/bin/pg_config -.else PG_CONFIG= ${LOCALBASE}/bin/pg_config -.endif CONFIGURE_ENV+= POSTGRES_INCLUDE=`${PG_CONFIG} --includedir` \ POSTGRES_LIB=`${PG_CONFIG} --libdir` -.endif .include <bsd.port.post.mk> diff --git a/databases/p5-DBD-PgSPI/Makefile b/databases/p5-DBD-PgSPI/Makefile index b63138c984da..d1fe9f011bd3 100644 --- a/databases/p5-DBD-PgSPI/Makefile +++ b/databases/p5-DBD-PgSPI/Makefile @@ -7,6 +7,7 @@ PORTNAME= DBD-PgSPI PORTVERSION= 0.02 +PORTREVISION= 2 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DBD @@ -19,26 +20,29 @@ BUILD_DEPENDS= ${RUN_DEPENDS} \ ${NONEXISTENT}:${PORTSDIR}/${POSTGRESQL_PORT}:configure RUN_DEPENDS= ${LOCALBASE}/lib/postgresql/plperl.so:${PORTSDIR}/databases/p5-postgresql-plperl \ ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes PERL_CONFIGURE= yes MAN3= DBD::PgSPI.3 -post-patch: - @${PERL} -i -pe '$$_ = "" if /ppport.h/' \ - ${WRKSRC}/PgSPI.h - .if !defined(NOPORTDOCS) PORTDOCS= Changes README -post-install: - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif +POSTGRESQL_PORT?= databases/postgresql${PGSQL_VER}-server +PGSQL_PORTDIR?= ${PORTSDIR}/${POSTGRESQL_PORT} +PGSQL_WRKSRC_CMD= cd ${PGSQL_PORTDIR} && ${MAKE} -V WRKSRC .include <bsd.port.pre.mk> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137 @@ -46,14 +50,20 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI .endif -POSTGRESQL_PORT?= databases/postgresql7 -PGSQL_PORTDIR?= ${PORTSDIR}/${POSTGRESQL_PORT} -PGSQL_WRKSRC!= cd ${PGSQL_PORTDIR} && ${MAKE} -V WRKSRC - -CONFIGURE_ENV= POSTGRES_HOME="${PGSQL_WRKSRC}/src" \ +CONFIGURE_ENV= POSTGRES_HOME="`${PGSQL_WRKSRC_CMD}`/src" \ LOCALBASE="${LOCALBASE}" +post-patch: + @${PERL} -i -pe '$$_ = "" if /ppport.h/' \ + ${WRKSRC}/PgSPI.h + post-clean: @cd ${PGSQL_PORTDIR} && ${MAKE} clean +post-install: + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} + @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." +.endif + .include <bsd.port.post.mk> diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile index 2e27b93f5773..ccaf0b8821c9 100644 --- a/databases/p5-Pg/Makefile +++ b/databases/p5-Pg/Makefile @@ -7,6 +7,7 @@ PORTNAME= Pg PORTVERSION= 2.1.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases perl5 MASTER_SITES= ftp://gborg.postgresql.org/pub/pgperl/stable/ @@ -16,9 +17,7 @@ DIST_SUBDIR= postgresql MAINTAINER= girgen@FreeBSD.org COMMENT= An interface for using perl5 to access PostgreSQL databases -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= yes USE_PERL5= yes MAN3= Pg.3 diff --git a/databases/p5-postgresql-plperl/Makefile b/databases/p5-postgresql-plperl/Makefile index 3e2747b93f13..a9e83c84802e 100644 --- a/databases/p5-postgresql-plperl/Makefile +++ b/databases/p5-postgresql-plperl/Makefile @@ -5,27 +5,37 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTNAME= postgresql CATEGORIES= databases perl5 -PKGNAMEPREFIX= p5- PKGNAMESUFFIX= -plperl MAINTAINER= girgen@FreeBSD.org -COMMENT= A module for using Perl5 to write SQL functions +COMMENT= Write SQL functions for PostgreSQL using Perl5 -POSTGRESQL_PORT?= databases/postgresql7 -POSTGRESQL_SUBPORT=YES -.include "../../${POSTGRESQL_PORT}/Makefile" +MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server -RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT} +RUN_DEPENDS= postgres:${.CURDIR}/../postgresql${PGSQL_VER}-server + +DEFAULT_PGSQL_VER?=74 + +# can't include <bsd.port.pre.mk> in a slave port +# so set these instead: +LOCALBASE?= ${DESTDIR}/usr/local +SED?= /usr/bin/sed + +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif USE_PERL5= yes CONFIGURE_ARGS= --with-perl -MAKE_ARGS+= -C src/pl/plperl -MAKEFILE= GNUmakefile - -post-install: - @ ${CAT} ${PKGMESSAGE} +BUILD_DIRS= src/pl/plperl +SLAVE_ONLY= yes -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/databases/p5-postgresql-plperl/files/patch-src-makefiles-Makefile.freebsd b/databases/p5-postgresql-plperl/files/patch-src-makefiles-Makefile.freebsd deleted file mode 100644 index 9760f2ca7fa0..000000000000 --- a/databases/p5-postgresql-plperl/files/patch-src-makefiles-Makefile.freebsd +++ /dev/null @@ -1,8 +0,0 @@ ---- src/makefiles/Makefile.freebsd.orig Wed Aug 29 21:14:40 2001 -+++ src/makefiles/Makefile.freebsd Mon Sep 1 10:16:26 2003 -@@ -23,3 +23,5 @@ - endif - - sqlmansect = 7 -+ -+allow_nonpic_in_shlib = yes diff --git a/databases/p5-postgresql-plperl/pkg-message b/databases/p5-postgresql-plperl/pkg-message deleted file mode 100644 index 5d0c83920563..000000000000 --- a/databases/p5-postgresql-plperl/pkg-message +++ /dev/null @@ -1,3 +0,0 @@ -PL/Perl has been installed. Check the createlang(l) manpage for more -info. You can install PL/Perl as trusted or untrusted, by using either -"createlang plperl" or "createlang plperlu". diff --git a/databases/p5-postgresql-plperl/pkg-plist b/databases/p5-postgresql-plperl/pkg-plist deleted file mode 100644 index 56bb75060a28..000000000000 --- a/databases/p5-postgresql-plperl/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/postgresql/plperl.so -@unexec rmdir %D/lib/postgresql 2>/dev/null || true diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile index 8ba5eba8f452..6a896b1e4e75 100644 --- a/databases/pgadmin3-12/Makefile +++ b/databases/pgadmin3-12/Makefile @@ -7,6 +7,7 @@ PORTNAME= pgadmin3 PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src @@ -14,16 +15,13 @@ MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src MAINTAINER= fjoe@FreeBSD.org COMMENT= PostgreSQL database design and management system -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wx=${X11BASE} CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" -POSTGRESQL_PORT?= databases/postgresql7 - post-patch: @${FIND} ${WRKSRC}/src \( -name '*.cpp' -or -name '*.h' \) -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} -e 's,wxNotifyEvent,wxCommandEvent,g' diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 8ba5eba8f452..6a896b1e4e75 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -7,6 +7,7 @@ PORTNAME= pgadmin3 PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src @@ -14,16 +15,13 @@ MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src MAINTAINER= fjoe@FreeBSD.org COMMENT= PostgreSQL database design and management system -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wx=${X11BASE} CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" -POSTGRESQL_PORT?= databases/postgresql7 - post-patch: @${FIND} ${WRKSRC}/src \( -name '*.cpp' -or -name '*.h' \) -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} -e 's,wxNotifyEvent,wxCommandEvent,g' diff --git a/databases/pgbash/Makefile b/databases/pgbash/Makefile index 70ce1c5f0a96..13dad1f835fd 100644 --- a/databases/pgbash/Makefile +++ b/databases/pgbash/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgbash PORTVERSION= 7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.psn.co.jp/PostgreSQL/pgbash/:pgsource \ ${MASTER_SITE_GNU:S/$/:bashsrc/} @@ -19,7 +19,7 @@ EXTRACT_ONLY= pgbash-7.3.tar.gz MAINTAINER= sascha@root-login.org COMMENT= SQL Bash Shell for PostgreSQL -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes WRKSRC= ${WRKDIR}/pgbash-7.3/src/bash-2.05a diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile index 1293fcd0f10e..9fe5ffa657d5 100644 --- a/databases/postgis/Makefile +++ b/databases/postgis/Makefile @@ -27,8 +27,9 @@ PGSQL_SRC= ${WRKDIR}/pgsql/postgresql INSTALL_TARGET= install INSTALLS_SHLIB= no -OPTIONS= PGSQL8 "Use PostgreSQL 8 instead of PostgreSQL 7.4" off \ - GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \ +OPTIONS= GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \ + +USE_PGSQL= YES .include <bsd.port.pre.mk> @@ -37,13 +38,7 @@ MAKE_ARGS= PGSQL_SRC="${PGSQL_SRC}" \ BINDIR="${PREFIX}/bin" \ LIBDIR="${PREFIX}/lib" -.if defined(WITH_PGSQL8) -PGSQL_PORTDIR= ${PORTSDIR}/databases/postgresql-devel -.else -PGSQL_PORTDIR= ${PORTSDIR}/databases/postgresql7 -.endif - -LIB_DEPENDS+= pq.3:${PGSQL_PORTDIR} +PGSQL_PORTDIR= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .if !defined(NOPORTDOCS) BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile index 08144388bece..ffc336f65ead 100644 --- a/databases/postgresql-contrib/Makefile +++ b/databases/postgresql-contrib/Makefile @@ -5,40 +5,44 @@ # $FreeBSD$ # +PORTNAME= postgresql +PKGNAMESUFFIX= -contrib PORTREVISION= 0 CATEGORIES= databases -PKGNAMESUFFIX= -contrib MAINTAINER= girgen@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution -LIB_DEPENDS= pq:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes +MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server + +DEFAULT_PGSQL_VER?=74 + +# can't include <bsd.port.pre.mk> in a slave port +# so set these instead: +LOCALBASE?= ${DESTDIR}/usr/local +SED?= /usr/bin/sed -POSTGRESQL_PORT?= databases/postgresql7 -POSTGRESQL_SUBPORT=YES -.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif -INSTALLS_SHLIB= yes USE_BISON= yes -CONFIGURE_ARGS= --with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ - --docdir=${DOCSDIR} -MAKE_ARGS= -C contrib +BUILD_DIRS= src/port contrib +INSTALL_DIRS= contrib -pre-build: - cd ${WRKSRC}/src/backend ;\ - ${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h - cd ${WRKSRC}/src/port; ${GMAKE} +SLAVE_ONLY= yes +PKGMESSAGE= ${.CURDIR}/pkg-message post-install: - @ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\ + @- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\ ${INSTALL_DATA} ${WRKSRC}/contrib/ipc_check/README ${DOCSDIR}/contrib/README.ipc_check ;\ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/reindexdb/reindexdb ${PREFIX}/bin/reindexdb ;\ ${INSTALL_DATA} ${WRKSRC}/contrib/reindexdb/README ${DOCSDIR}/contrib/README.reindexdb - @ ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README - @ ${ECHO} ==================================== ;\ - ${SED} -e "s,/usr/local,${PREFIX},g" ${PKGDIR}/pkg-message ;\ - ${ECHO} ==================================== + @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql-contrib/pkg-message b/databases/postgresql-contrib/pkg-message deleted file mode 100644 index 8120f2d8d89c..000000000000 --- a/databases/postgresql-contrib/pkg-message +++ /dev/null @@ -1,3 +0,0 @@ -The PostgreSQL contrib utilities have been installed. Please see -/usr/local/share/doc/postgresql/contrib/README -for more information. diff --git a/databases/postgresql-contrib/pkg-plist b/databases/postgresql-contrib/pkg-plist deleted file mode 100644 index d3af90cf4a59..000000000000 --- a/databases/postgresql-contrib/pkg-plist +++ /dev/null @@ -1,144 +0,0 @@ -bin/ApplySnapshot -bin/CleanLog -bin/GetSyncID -bin/InitRservTest -bin/MasterAddTable -bin/MasterInit -bin/MasterSync -bin/PrepareSnapshot -bin/Replicate -bin/RservTest -bin/SlaveAddTable -bin/SlaveInit -bin/dbf2pg -bin/findoidjoins -bin/fti.pl -bin/ipc_check -bin/make_oidjoins_check -bin/oid2name -bin/pg_autovacuum -bin/pg_dumplo -bin/pg_logger -bin/pgbench -bin/reindexdb -bin/vacuumlo -lib/postgresql/_int.so -lib/postgresql/autoinc.so -lib/postgresql/btree_gist.so -lib/postgresql/chkpass.so -lib/postgresql/cube.so -lib/postgresql/dblink.so -lib/postgresql/dbsize.so -lib/postgresql/earthdistance.so -lib/postgresql/fti.so -lib/postgresql/fuzzystrmatch.so -lib/postgresql/insert_username.so -lib/postgresql/int_aggregate.so -lib/postgresql/isbn_issn.so -lib/postgresql/lo.so -lib/postgresql/ltree.so -lib/postgresql/misc_utils.so -lib/postgresql/moddatetime.so -lib/postgresql/noup.so -lib/postgresql/pending.so -lib/postgresql/pgcrypto.so -lib/postgresql/pgstattuple.so -lib/postgresql/refint.so -lib/postgresql/rserv.so -lib/postgresql/rtree_gist.so -lib/postgresql/seg.so -lib/postgresql/string_io.so -lib/postgresql/tablefunc.so -lib/postgresql/timetravel.so -lib/postgresql/tsearch.so -lib/postgresql/tsearch2.so -lib/postgresql/user_locks.so -%%DOCSDIR%%/contrib/README -%%DOCSDIR%%/contrib/README.apachelog -%%DOCSDIR%%/contrib/README.btree_gist -%%DOCSDIR%%/contrib/README.chkpass -%%DOCSDIR%%/contrib/README.cube -%%DOCSDIR%%/contrib/README.dbf2pg -%%DOCSDIR%%/contrib/README.dblink -%%DOCSDIR%%/contrib/README.dbmirror -%%DOCSDIR%%/contrib/README.dbsize -%%DOCSDIR%%/contrib/README.earthdistance -%%DOCSDIR%%/contrib/README.findoidjoins -%%DOCSDIR%%/contrib/README.fti -%%DOCSDIR%%/contrib/README.fuzzystrmatch -%%DOCSDIR%%/contrib/README.int_aggregate -%%DOCSDIR%%/contrib/README.intarray -%%DOCSDIR%%/contrib/README.ipc_check -%%DOCSDIR%%/contrib/README.isbn_issn -%%DOCSDIR%%/contrib/README.lo -%%DOCSDIR%%/contrib/README.ltree -%%DOCSDIR%%/contrib/README.misc_utils -%%DOCSDIR%%/contrib/README.noup -%%DOCSDIR%%/contrib/README.oid2name -%%DOCSDIR%%/contrib/README.pg_autovacuum -%%DOCSDIR%%/contrib/README.pg_dumplo -%%DOCSDIR%%/contrib/README.pg_logger -%%DOCSDIR%%/contrib/README.pgbench -%%DOCSDIR%%/contrib/README.pgbench_jis -%%DOCSDIR%%/contrib/README.pgcrypto -%%DOCSDIR%%/contrib/README.pgstattuple -%%DOCSDIR%%/contrib/README.pgstattuple.euc_jp -%%DOCSDIR%%/contrib/README.reindexdb -%%DOCSDIR%%/contrib/README.rserv -%%DOCSDIR%%/contrib/README.rtree_gist -%%DOCSDIR%%/contrib/README.seg -%%DOCSDIR%%/contrib/README.soundex -%%DOCSDIR%%/contrib/README.spi -%%DOCSDIR%%/contrib/README.string_io -%%DOCSDIR%%/contrib/README.tablefunc -%%DOCSDIR%%/contrib/README.tsearch -%%DOCSDIR%%/contrib/README.tsearch2 -%%DOCSDIR%%/contrib/README.user_locks -%%DOCSDIR%%/contrib/README.vacuumlo -%%DOCSDIR%%/contrib/autoinc.example -%%DOCSDIR%%/contrib/insert_username.example -%%DOCSDIR%%/contrib/moddatetime.example -%%DOCSDIR%%/contrib/refint.example -%%DOCSDIR%%/contrib/timetravel.example -share/postgresql/contrib/RServ.pm -share/postgresql/contrib/_int.sql -share/postgresql/contrib/autoinc.sql -share/postgresql/contrib/btree_gist.sql -share/postgresql/contrib/chkpass.sql -share/postgresql/contrib/cube.sql -share/postgresql/contrib/dblink.sql -share/postgresql/contrib/dbsize.sql -share/postgresql/contrib/earthdistance.sql -share/postgresql/contrib/english.stop -share/postgresql/contrib/fti.sql -share/postgresql/contrib/fuzzystrmatch.sql -share/postgresql/contrib/insert_username.sql -share/postgresql/contrib/int_aggregate.sql -share/postgresql/contrib/isbn_issn.sql -share/postgresql/contrib/lo.sql -share/postgresql/contrib/lo_drop.sql -share/postgresql/contrib/lo_test.sql -share/postgresql/contrib/ltree.sql -share/postgresql/contrib/master.sql -share/postgresql/contrib/misc_utils.sql -share/postgresql/contrib/moddatetime.sql -share/postgresql/contrib/noup.sql -share/postgresql/contrib/pgcrypto.sql -share/postgresql/contrib/pgstattuple.sql -share/postgresql/contrib/refint.sql -share/postgresql/contrib/rtree_gist.sql -share/postgresql/contrib/russian.stop -share/postgresql/contrib/seg.sql -share/postgresql/contrib/slave.sql -share/postgresql/contrib/string_io.sql -share/postgresql/contrib/tablefunc.sql -share/postgresql/contrib/timetravel.sql -share/postgresql/contrib/tsearch.sql -share/postgresql/contrib/tsearch2.sql -share/postgresql/contrib/untsearch2.sql -share/postgresql/contrib/user_locks.sql -@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true -@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true -@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true -@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true -@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile index 3db6ae72b743..a2ee5df8f225 100644 --- a/databases/postgresql-docs/Makefile +++ b/databases/postgresql-docs/Makefile @@ -5,19 +5,33 @@ # $FreeBSD$ # +PORTNAME= postgresql PORTREVISION= 0 PKGNAMESUFFIX= -docs MAINTAINER= girgen@FreeBSD.org COMMENT= The PostgreSQL documentation set -POSTGRESQL_SUBPORT= YES -POSTGRESQL_PORT?= databases/postgresql7 -.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile> +MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server + +DEFAULT_PGSQL_VER?=74 + +# can't include <bsd.port.pre.mk> in a slave port +# so set these instead: +LOCALBASE?= ${DESTDIR}/usr/local +SED?= /usr/bin/sed + +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif + DISTFILES= postgresql-docs-${PORTVERSION}${EXTRACT_SUFX} -.undef USE_GMAKE -.undef GNU_CONFIGURE NO_BUILD= YES +SLAVE_ONLY= YES +PATCHDIR= mustnotexist do-install: @ $(MKDIR) ${DOCSDIR}/html; \ @@ -32,4 +46,4 @@ post-install: ${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\ ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST} -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql-libpq++/Makefile b/databases/postgresql-libpq++/Makefile index a147bb85a858..2e395adab12d 100644 --- a/databases/postgresql-libpq++/Makefile +++ b/databases/postgresql-libpq++/Makefile @@ -7,7 +7,7 @@ PORTNAME= libpq++ PORTVERSION= 4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ftp://gborg.postgresql.org/pub/libpqpp/stable/ PKGNAMEPREFIX= postgresql- @@ -16,9 +16,7 @@ DIST_SUBDIR= postgresql MAINTAINER= girgen@FreeBSD.org COMMENT= C++ interface for PostgreSQL -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= YES USE_GMAKE= YES USE_REINPLACE= YES INSTALLS_SHLIB= YES diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile index 00b477e2a98c..895ffb20e6eb 100644 --- a/databases/postgresql-libpqxx/Makefile +++ b/databases/postgresql-libpqxx/Makefile @@ -16,8 +16,7 @@ DIST_SUBDIR= postgresql MAINTAINER= girgen@FreeBSD.org COMMENT= A new C++ interface for PostgreSQL -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= YES USE_INC_LIBTOOL_VER=15 USE_GMAKE= YES GNU_CONFIGURE= YES @@ -28,8 +27,6 @@ CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ --enable-shared \ --with-postgres-include=${LOCALBASE}/include/postgresql -POSTGRESQL_PORT?= databases/postgresql7 - .include <bsd.port.pre.mk> .if ${OSVERSION} < 500035 diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist index bab88d7cc79b..3d1db56ff81c 100644 --- a/databases/postgresql-libpqxx/pkg-plist +++ b/databases/postgresql-libpqxx/pkg-plist @@ -71,3 +71,4 @@ lib/libpqxx.so lib/libpqxx-%%PORTVERSION%%.so libdata/pkgconfig/libpqxx.pc @dirrm include/pqxx +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile index 00b477e2a98c..895ffb20e6eb 100644 --- a/databases/postgresql-libpqxx3/Makefile +++ b/databases/postgresql-libpqxx3/Makefile @@ -16,8 +16,7 @@ DIST_SUBDIR= postgresql MAINTAINER= girgen@FreeBSD.org COMMENT= A new C++ interface for PostgreSQL -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= YES USE_INC_LIBTOOL_VER=15 USE_GMAKE= YES GNU_CONFIGURE= YES @@ -28,8 +27,6 @@ CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ --enable-shared \ --with-postgres-include=${LOCALBASE}/include/postgresql -POSTGRESQL_PORT?= databases/postgresql7 - .include <bsd.port.pre.mk> .if ${OSVERSION} < 500035 diff --git a/databases/postgresql-libpqxx3/pkg-plist b/databases/postgresql-libpqxx3/pkg-plist index bab88d7cc79b..3d1db56ff81c 100644 --- a/databases/postgresql-libpqxx3/pkg-plist +++ b/databases/postgresql-libpqxx3/pkg-plist @@ -71,3 +71,4 @@ lib/libpqxx.so lib/libpqxx-%%PORTVERSION%%.so libdata/pkgconfig/libpqxx.pc @dirrm include/pqxx +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile index 00b477e2a98c..895ffb20e6eb 100644 --- a/databases/postgresql-libpqxx30/Makefile +++ b/databases/postgresql-libpqxx30/Makefile @@ -16,8 +16,7 @@ DIST_SUBDIR= postgresql MAINTAINER= girgen@FreeBSD.org COMMENT= A new C++ interface for PostgreSQL -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - +USE_PGSQL= YES USE_INC_LIBTOOL_VER=15 USE_GMAKE= YES GNU_CONFIGURE= YES @@ -28,8 +27,6 @@ CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ --enable-shared \ --with-postgres-include=${LOCALBASE}/include/postgresql -POSTGRESQL_PORT?= databases/postgresql7 - .include <bsd.port.pre.mk> .if ${OSVERSION} < 500035 diff --git a/databases/postgresql-libpqxx30/pkg-plist b/databases/postgresql-libpqxx30/pkg-plist index bab88d7cc79b..3d1db56ff81c 100644 --- a/databases/postgresql-libpqxx30/pkg-plist +++ b/databases/postgresql-libpqxx30/pkg-plist @@ -71,3 +71,4 @@ lib/libpqxx.so lib/libpqxx-%%PORTVERSION%%.so libdata/pkgconfig/libpqxx.pc @dirrm include/pqxx +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true diff --git a/databases/postgresql-plpython/Makefile b/databases/postgresql-plpython/Makefile index 63a600a7ca54..821eb01b3660 100644 --- a/databases/postgresql-plpython/Makefile +++ b/databases/postgresql-plpython/Makefile @@ -5,21 +5,40 @@ # $FreeBSD$ # +PORTNAME= postgresql +PORTREVISION= 1 CATEGORIES= databases python PKGNAMESUFFIX= -plpython MAINTAINER= dd@FreeBSD.org COMMENT= A module for using Python to write SQL functions -POSTGRESQL_PORT?= databases/postgresql7 -POSTGRESQL_SUBPORT=YES -.include "../../${POSTGRESQL_PORT}/Makefile" - RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT} -USE_PYTHON= yes +MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server + +DEFAULT_PGSQL_VER?=74 + +# can't include <bsd.port.pre.mk> in a slave port +# so set these instead: +LOCALBASE?= ${DESTDIR}/usr/local +SED?= /usr/bin/sed -MAKE_ARGS+= -C src/pl/plpython +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif + +USE_PYTHON= yes CONFIGURE_ARGS= --with-python -.include <bsd.port.mk> +BUILD_DIRS= src/pl/plpython +SLAVE_ONLY= yes + +POSTGRESQL_PORT=databases/postgresql${PGSQL_VER}-server + +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql-plpython/files/patch-plpython-Makefile b/databases/postgresql-plpython/files/patch-plpython-Makefile deleted file mode 100644 index a1303151170a..000000000000 --- a/databases/postgresql-plpython/files/patch-plpython-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pl/plpython/Makefile~ Thu Mar 4 08:06:19 2004 -+++ src/pl/plpython/Makefile Thu Mar 4 08:06:44 2004 -@@ -8,7 +8,7 @@ - # On some platforms we can only build PL/Python if libpython is a - # shared library. Since there is no official way to determine this, - # we see if there is a file that is named like a shared library. --ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*)) -+ifneq (,$(wildcard $(python_configdir)/../../libpython*$(DLSUFFIX)*)) - shared_libpython = yes - endif - diff --git a/databases/postgresql-plpython/pkg-plist b/databases/postgresql-plpython/pkg-plist deleted file mode 100644 index 2e953a0a80d3..000000000000 --- a/databases/postgresql-plpython/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/postgresql/plpython.so -@unexec rmdir %D/lib/postgresql 2>/dev/null || true diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile index a9944ad6818b..82d65c0ed1dc 100644 --- a/databases/postgresql-plruby/Makefile +++ b/databases/postgresql-plruby/Makefile @@ -7,6 +7,7 @@ PORTNAME= plruby PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= databases ruby MASTER_SITES= ftp://moulon.inra.fr/pub/ruby/ PKGNAMEPREFIX= postgresql- @@ -16,19 +17,18 @@ MAINTAINER= knu@FreeBSD.org COMMENT= PL/Ruby procedural language for the PostgreSQL database system BUILD_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT} -LIB_DEPENDS= pq.3:${PGSQL_PORTDIR} RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_RUBY_RDOC= yes -POSTGRESQL_PORT?= databases/postgresql7 -PGSQL_VERSION?= 74 +POSTGRESQL_PORT?= databases/postgresql${PGSQL_VER}-server PGSQL_PORTDIR?= ${PORTSDIR}/${POSTGRESQL_PORT} PGSQL_WRKSRC_CMD= cd ${PGSQL_PORTDIR} && ${MAKE} -V WRKSRC -CONFIGURE_ARGS= --with-pgsql-version="${PGSQL_VERSION}" \ +CONFIGURE_ARGS= --with-pgsql-version="${PGSQL_VER}" \ --with-pgsql-srcinc="`${PGSQL_WRKSRC_CMD}`/src/include" \ --with-pgsql-include="${LOCALBASE}/include" \ --with-pgsql-lib="${LOCALBASE}/lib" @@ -58,6 +58,17 @@ post-build: cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc .endif +.include <bsd.port.pre.mk> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_MODEXAMPLESDIR}/ @@ -70,4 +81,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile index f0814441f400..6da2bd8a9ff7 100644 --- a/databases/postgresql-pltcl/Makefile +++ b/databases/postgresql-pltcl/Makefile @@ -5,6 +5,7 @@ # $FreeBSD$ # +PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases tcl${TCLVERSION:S/.//} PKGNAMESUFFIX= -pltcl @@ -12,12 +13,26 @@ PKGNAMESUFFIX= -pltcl MAINTAINER= girgen@FreeBSD.org COMMENT= A module for using Tcl to write SQL functions -POSTGRESQL_PORT?= databases/postgresql7 -POSTGRESQL_SUBPORT=YES -.include "../../${POSTGRESQL_PORT}/Makefile" +MASTERDIR= ${.CURDIR}/../postgresql${PGSQL_VER}-server +RUN_DEPENDS= postgres:${MASTERDIR} LIB_DEPENDS= tcl${TCLVERSION:S/.//}:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//} -RUN_DEPENDS= postgres:${PORTSDIR}/${POSTGRESQL_PORT} + +DEFAULT_PGSQL_VER?=74 + +# can't include <bsd.port.pre.mk> in a slave port +# so set these instead: +LOCALBASE?= ${DESTDIR}/usr/local +SED?= /usr/bin/sed + +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif # you can use "make TCLVERSION=8.4" or similar for your favourite tcl version TCLVERSION?= 8.4 @@ -27,10 +42,9 @@ CONFIGURE_ARGS= --with-tcl --without-tk \ TCL_INCDIR= ${LOCALBASE}/include/tcl${TCLVERSION} TCLCONFIG= ${LOCALBASE}/lib/tcl${TCLVERSION} -MAKE_ARGS+= -C src/pl/tcl MAKE_ENV+= TCL_INCDIR=${TCL_INCDIR} -post-install: - @ ${CAT} ${PKGMESSAGE} +BUILD_DIRS= src/pl/tcl +SLAVE_ONLY= yes -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql-pltcl/pkg-message b/databases/postgresql-pltcl/pkg-message deleted file mode 100644 index 0902b858de0b..000000000000 --- a/databases/postgresql-pltcl/pkg-message +++ /dev/null @@ -1,3 +0,0 @@ -PL/Tcl has been installed. Check the createlang(l) manpage for more -info. You can install pltcl as trusted or untrusted, by using either -"createlang pltcl" or "createlang pltclu". diff --git a/databases/postgresql-pltcl/pkg-plist b/databases/postgresql-pltcl/pkg-plist deleted file mode 100644 index 2c4bbd54fb36..000000000000 --- a/databases/postgresql-pltcl/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -lib/postgresql/pltcl.so -@unexec rmdir %D/lib/postgresql 2>/dev/null || true -bin/pltcl_loadmod -bin/pltcl_delmod -bin/pltcl_listmod -share/postgresql/unknown.pltcl -@unexec rmdir %D/share/postgresql 2>/dev/null || true diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile index a1d1b3bed9b2..7066d263ce26 100644 --- a/databases/py-PyGreSQL/Makefile +++ b/databases/py-PyGreSQL/Makefile @@ -7,6 +7,7 @@ PORTNAME= PyGreSQL PORTVERSION= 3.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases python MASTER_SITES= ftp://ftp.pygresql.org/pub/distrib/ @@ -18,9 +19,8 @@ COMMENT= A Python interface to PostgreSQL, both classic and DP-API 2.0 BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base -LIB_DEPENDS= pq:${PORTSDIR}/${POSTGRESQL_PORT} -POSTGRESQL_PORT?= databases/postgresql7 +USE_PGSQL= yes USE_PYTHON= yes DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py USE_REINPLACE=yes diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index 6e316ce9e92b..26bc00e43a0a 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -17,14 +17,12 @@ COMMENT= The high performance Python adapter for PostgreSQL RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes USE_GMAKE= yes USE_PYTHON= yes GNU_CONFIGURE= yes -POSTGRESQL_PORT?= databases/postgresql7 - ALL_TARGET= sharedmods CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile index b21e1813ef35..f2122326cfa1 100644 --- a/databases/py-pyPgSQL/Makefile +++ b/databases/py-pyPgSQL/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyPgSQL PORTVERSION= 2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= pypgsql @@ -18,11 +18,10 @@ MAINTAINER= gerhard.haering@gmx.de COMMENT= A Python DB-API 2 compliant library for using PostgreSQL databases RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - -POSTGRESQL_PORT?= databases/postgresql7 WRKSRC= ${WRKDIR}/pypgsql + +USE_PGSQL= yes USE_PYTHON= yes USE_PYDISTUTILS= yes diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile index 6ab09ad7fae9..5c01fa9e0bf1 100644 --- a/databases/qt-pgsql-plugin/Makefile +++ b/databases/qt-pgsql-plugin/Makefile @@ -8,6 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.silug.org/pub/qt/ \ @@ -21,11 +22,9 @@ COMMENT= A plugin for QT to connect to PostgreSQL-Databases DB= psql -LIB_DEPENDS+= pq:${PORTSDIR}/${POSTGRESQL_PORT} \ - qt-mt:${PORTSDIR}/x11-toolkits/qt33 - -POSTGRESQL_PORT?= databases/postgresql7 +LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 +USE_PGSQL= yes USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} DRIVER= src/sql/drivers/${DB} diff --git a/databases/ruby-postgres/Makefile b/databases/ruby-postgres/Makefile index 10b4ad5c3033..4332f422f132 100644 --- a/databases/ruby-postgres/Makefile +++ b/databases/ruby-postgres/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgres PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases ruby MASTER_SITES= http://www.postgresql.jp/interfaces/ruby/archive/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -17,10 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to PostgreSQL library -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - -POSTGRESQL_PORT?= databases/postgresql7 - +USE_PGSQL= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile index 10b4ad5c3033..4332f422f132 100644 --- a/databases/rubygem-postgres/Makefile +++ b/databases/rubygem-postgres/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgres PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases ruby MASTER_SITES= http://www.postgresql.jp/interfaces/ruby/archive/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -17,10 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to PostgreSQL library -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - -POSTGRESQL_PORT?= databases/postgresql7 - +USE_PGSQL= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile index 529185de450c..c5683f2896bd 100644 --- a/databases/slony1/Makefile +++ b/databases/slony1/Makefile @@ -7,13 +7,14 @@ PORTNAME= slony1 PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://developer.postgresql.org/~wieck/slony1/download/ MAINTAINER= vivek@khera.org COMMENT= PostgreSQL master to multiple slaves replication system -PGSQL_PORT= ${PORTSDIR}/databases/postgresql7 +PGSQL_PORT= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-server BUILD_DEPENDS= ${NONEXISTENT}:${PGSQL_PORT}:configure .if ! defined(NOPORTDOCS) BUILD_DEPENDS+= ${LOCALBASE}/bin/pnmtops:${PORTSDIR}/graphics/netpbm \ @@ -43,6 +44,19 @@ PLIST_FILES= bin/slon bin/slonik bin/slony_setup.pl \ share/postgresql/xxid.v74.sql PORTDOCS= *.pdf howto COPYRIGHT README slonik_commands.html +DEFAULT_PGSQL_VER?=74 + +.include <bsd.port.pre.mk> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif + pre-configure: cd ${PGSQL_SRC}/src/interfaces/libpq && ${GMAKE} all cd ${PGSQL_SRC}/src/port && ${GMAKE} all @@ -61,4 +75,4 @@ do-install: .endif ${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile index 529185de450c..c5683f2896bd 100644 --- a/databases/slony1v2/Makefile +++ b/databases/slony1v2/Makefile @@ -7,13 +7,14 @@ PORTNAME= slony1 PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://developer.postgresql.org/~wieck/slony1/download/ MAINTAINER= vivek@khera.org COMMENT= PostgreSQL master to multiple slaves replication system -PGSQL_PORT= ${PORTSDIR}/databases/postgresql7 +PGSQL_PORT= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-server BUILD_DEPENDS= ${NONEXISTENT}:${PGSQL_PORT}:configure .if ! defined(NOPORTDOCS) BUILD_DEPENDS+= ${LOCALBASE}/bin/pnmtops:${PORTSDIR}/graphics/netpbm \ @@ -43,6 +44,19 @@ PLIST_FILES= bin/slon bin/slonik bin/slony_setup.pl \ share/postgresql/xxid.v74.sql PORTDOCS= *.pdf howto COPYRIGHT README slonik_commands.html +DEFAULT_PGSQL_VER?=74 + +.include <bsd.port.pre.mk> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.elif exists(${LOCALBASE}/bin/pg_config) +PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif + pre-configure: cd ${PGSQL_SRC}/src/interfaces/libpq && ${GMAKE} all cd ${PGSQL_SRC}/src/port && ${GMAKE} all @@ -61,4 +75,4 @@ do-install: .endif ${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 4c86b9e5f033..b41525043f4e 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -34,8 +34,6 @@ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes -POSTGRESQL_PORT?= databases/postgresql7 - .include "${.CURDIR}/Makefile.common" OPTIONS= MSQL "Build MSQL connection" off \ @@ -89,7 +87,7 @@ IF_MSQL= "@comment " .endif .if defined(WITH_POSTGRESQL) && ${WITH_POSTGRESQL:L} != no -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" IF_POSTGRESQL= "" .else diff --git a/devel/libpreps-devel/Makefile b/devel/libpreps-devel/Makefile index fc66e9ef3ff4..65056280b63f 100644 --- a/devel/libpreps-devel/Makefile +++ b/devel/libpreps-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpreps PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://webpages.charter.net/stuffle/linux/preps/ PKGNAMESUFFIX= -devel @@ -15,13 +16,12 @@ DIST_SUBDIR= prep MAINTAINER= shadow@psoft.net COMMENT= Problem reporting system -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 - CONFLICTS= libpreps-1.6.* LATEST_LINK= libpreps-devel INSTALLS_SHLIB= yes +USE_PGSQL= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= glib12 @@ -30,6 +30,8 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} +.include <bsd.port.pre.mk> + .if defined(WITHOUT_SERVER) CONFIGURE_ARGS+=--disable-server PKGNAMESUFFIX= -client @@ -39,4 +41,15 @@ MAN1= create_prepsdb.1 update_prepsdb.1 PLIST_SUB+= SERVER="" .endif -.include <bsd.port.mk> +# Setting/finding PostgreSQL version we want. +.if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +.else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +.endif +PGSQL_PORT= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-server +BUILD_DEPENDS+= postgres:${PGSQL_PORT} +RUN_DEPENDS+= postgres:${PGSQL_PORT} + +.include <bsd.port.post.mk> diff --git a/devel/libpreps/Makefile b/devel/libpreps/Makefile index 9dd09f9a921a..e6544784ed1b 100644 --- a/devel/libpreps/Makefile +++ b/devel/libpreps/Makefile @@ -14,10 +14,9 @@ DIST_SUBDIR= prep MAINTAINER= shadow@psoft.net COMMENT= Problem reporting system -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 - CONFLICTS= libpreps-devel-1.9.* +USE_PGSQL= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= glib12 @@ -29,6 +28,8 @@ CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + .if defined(WITHOUT_SERVER) CONFIGURE_ARGS+=--disable-server PKGNAMESUFFIX= -client @@ -36,6 +37,16 @@ PLIST_SUB+= SERVER="@comment " .else MAN1= create_prepsdb.1 update_prepsdb.1 PLIST_SUB+= SERVER="" +# Setting/finding PostgreSQL version we want. +. if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +. else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +. endif +PGSQL_PORT= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-server +BUILD_DEPENDS+= postgres:${PGSQL_PORT} +RUN_DEPENDS+= postgres:${PGSQL_PORT} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile index 9dd09f9a921a..e6544784ed1b 100644 --- a/devel/prepstools/Makefile +++ b/devel/prepstools/Makefile @@ -14,10 +14,9 @@ DIST_SUBDIR= prep MAINTAINER= shadow@psoft.net COMMENT= Problem reporting system -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 - CONFLICTS= libpreps-devel-1.9.* +USE_PGSQL= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= glib12 @@ -29,6 +28,8 @@ CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + .if defined(WITHOUT_SERVER) CONFIGURE_ARGS+=--disable-server PKGNAMESUFFIX= -client @@ -36,6 +37,16 @@ PLIST_SUB+= SERVER="@comment " .else MAN1= create_prepsdb.1 update_prepsdb.1 PLIST_SUB+= SERVER="" +# Setting/finding PostgreSQL version we want. +. if exists(${LOCALBASE}/bin/postmaster) +PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ + ${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p' +. else +PGSQL_VER= ${DEFAULT_PGSQL_VER} +. endif +PGSQL_PORT= ${PORTSDIR}/databases/postgresql${PGSQL_VER}-server +BUILD_DEPENDS+= postgres:${PGSQL_PORT} +RUN_DEPENDS+= postgres:${PGSQL_PORT} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/root/Makefile b/devel/root/Makefile index 548fd98f552b..d77e9c250ba9 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -114,7 +114,7 @@ PLIST_SUB+= AFTERIMAGE="@comment " .if !defined(WITHOUT_POSTGRESQL) && defined(WITH_POSTGRESQL) CONFIGURE_ARGS+= --enable-pgsql -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes PLIST_SUB+= POSTGRESQL="" .else CONFIGURE_ARGS+= --disable-pgsql diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile index 185fbe4605fa..50b990a10ea4 100644 --- a/dns/bind9-dlz/Makefile +++ b/dns/bind9-dlz/Makefile @@ -25,7 +25,6 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= The Berkeley Internet Name Daemon, with DLZ extensions CONFLICTS?= bind-8.* bind84-8.* bind9-9.* bind9-sdb-mysql-* host-* skalibs-* -POSTGRESQL_PORT?= databases/postgresql7 MASTER_SITES_DLZ= ${MASTER_SITE_SOURCEFORGE} ISCVERSION= 9.2.2 @@ -51,7 +50,7 @@ NO_DESCRIBE=yes .if defined(WITH_POSTGRESQL_DRIVER) .if !defined(WITHOUT_POSTGRESQL_DRIVER) POSTGRESQL_SUFFIX= +postgres -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-dlz-postgres .endif .endif diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile index 8af5630a33f6..bc84bed3aa68 100644 --- a/dns/mydns-ng/Makefile +++ b/dns/mydns-ng/Makefile @@ -35,8 +35,7 @@ CONFIGURE_ARGS+=--with-openssl .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+=--without-mysql PKGNAMESUFFIX= -pg .else diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile index 8af5630a33f6..bc84bed3aa68 100644 --- a/dns/mydns/Makefile +++ b/dns/mydns/Makefile @@ -35,8 +35,7 @@ CONFIGURE_ARGS+=--with-openssl .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+=--without-mysql PKGNAMESUFFIX= -pg .else diff --git a/dns/sqldjbdns/Makefile b/dns/sqldjbdns/Makefile index 5e12b16c5d46..a525647812a8 100644 --- a/dns/sqldjbdns/Makefile +++ b/dns/sqldjbdns/Makefile @@ -7,6 +7,7 @@ PORTNAME= sqldjbdns PORTVERSION= 0.72 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://home.tiscali.cz:8080/~cz210552/distfiles/ @@ -15,9 +16,10 @@ COMMENT= DJB dns server with PostgreSQL backend DJ_PORT?= ${PORTSDIR}/dns/djbdns BUILD_DEPENDS= ${NONEXISTENT}:${DJ_PORT}:extract -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools +USE_PGSQL= YES + PORTDOCS= ANNOUNCEMENT STATUS pgsqldns.html NEWS TODO README \ pgsqldns-conf.html sqldns.html pgsqldns-schema.html DJ_SRC= `cd ${DJ_PORT} && make -V WRKSRC` diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index 63c44f47eaa0..fa4ca01c820c 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -45,8 +45,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --enable-psql PLIST_SUB+= PGSQL="" .else diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index f9f77f0d9070..5ff36c7ded84 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -126,8 +126,7 @@ LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql .endif .if defined(WITH_POSTGRESQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index f9f77f0d9070..5ff36c7ded84 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -126,8 +126,7 @@ LIBDIRS:=${LIBDIRS}:${PREFIX}/lib/mysql .endif .if defined(WITH_POSTGRESQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes MODULES:=${MODULES}:mod_sql:mod_sql_postgres INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include LIBDIRS:=${LIBDIRS}:${PREFIX}/lib diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 096f8b029cc4..55edf149b409 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -68,8 +68,7 @@ CONFIGURE_ARGS+= --with-mysql # postgresql support requested? .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql .endif diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile index a2f581e822bd..8ada735a1113 100644 --- a/japanese/postgresql-tcltk/Makefile +++ b/japanese/postgresql-tcltk/Makefile @@ -5,51 +5,17 @@ # $FreeBSD$ # -PORTNAME= postgresql-tcltk -CATEGORIES= japanese databases +PORTNAME= postgresql +PORTREVISION= 0 +CATEGORIES= japanese databases tcl${TCLVERSION:C/[^0-9]//g} +PKGNAMESUFFIX= -tcltk MAINTAINER= saito@a2z.co.jp -COMMENT= An TCL interface to the database PostgreSQL, including a tk GUI - -POSTGRESQL_PORT?= databases/postgresql7 -POSTGRESQL_SUBPORT=YES -.include <${.CURDIR}/../../databases/postgresql7/Makefile> - -LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80 \ - pq:${PORTSDIR}/databases/postgresql7 \ - tcl80jp.1:${PORTSDIR}/japanese/tcl80 \ - tk80jp.1:${PORTSDIR}/japanese/tk80 +COMMENT= A TCL interface to the database PostgreSQL, including a tk GUI TCLVERSION?= 8.0jp -PLIST_SUB+= TCLVERSION=${TCLVERSION} -CONFIGURE_ARGS= --with-tcl \ - --with-tclconfig=${TCLCONFIG} \ - --with-includes=${INCDIRS} - -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_ARGS+= --with-tkconfig="${TKCONFIG}" -TK_INCDIR= ${LOCALBASE}/include/tk${TCLVERSION} -TKCONFIG= ${LOCALBASE}/lib/tk${TCLVERSION} -INCDIRS= ${TCL_INCDIR}:${TK_INCDIR} -PLIST_SUB+= TK="" - -pre-build: - cd ${WRKSRC}/src/port; ${GMAKE} - -do-build: - @ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh - @ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl -do-install: - @ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/bin/pgtclsh install - @ cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} -C src/interfaces/libpgtcl install -# Preparing a loadable TCL-package (pkgIndex.tcl) - @${MKDIR} ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3 - @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pkgIndex.tcl.in \ - > ${PREFIX}/lib/tcl${TCLVERSION}/Pgtcl1.3/pkgIndex.tcl +TCLPORTDIR= ${PORTSDIR}/japanese/tcl +TKPORTDIR= ${PORTSDIR}/japanese/tk -.include <bsd.port.mk> +.include <${.CURDIR}/../../databases/postgresql-tcltk/Makefile> diff --git a/japanese/postgresql-tcltk/files/pkgIndex.tcl.in b/japanese/postgresql-tcltk/files/pkgIndex.tcl.in deleted file mode 100644 index bd8329b15c69..000000000000 --- a/japanese/postgresql-tcltk/files/pkgIndex.tcl.in +++ /dev/null @@ -1,4 +0,0 @@ -# Package-index file for Pgtcl-package. Enables you to load PostgreSQL -# interface functions right into you TCL-interpreter as simply as -# package require Pgtcl -package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so" diff --git a/japanese/postgresql-tcltk/pkg-descr b/japanese/postgresql-tcltk/pkg-descr deleted file mode 100644 index 32561ddf75c7..000000000000 --- a/japanese/postgresql-tcltk/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -libpgtcl is a library that implements Tcl commands for front-end -clients to interact with the Postgresql backends. - -pgaccess is a great graphical database management tool for PostgreSQL. - -This software is part of the standard PostgreSQL distribution. - -WWW: http://www.postgresql.org/ diff --git a/japanese/postgresql-tcltk/pkg-plist b/japanese/postgresql-tcltk/pkg-plist deleted file mode 100644 index 0f3874b3acb0..000000000000 --- a/japanese/postgresql-tcltk/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/pgtclsh -include/libpgtcl.h -lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl -@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3 -lib/libpgtcl.a -lib/libpgtcl.so -lib/libpgtcl.so.2 -%%TK%%bin/pgtksh -%%TK%%@unexec rmdir %D/share/postgresql 2>/dev/null || true diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index ac7bd8cbe527..6a9858ab4e70 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -69,11 +69,11 @@ NEW${lib:U}!= ${LDCONFIG} -r | ${GREP} ${lib} | ${GREP} -v 'compat/pkg' \ | ${AWK} -F 'lib\/' '{print $$2}' .endfor -.if exists(${LOCALBASE}/include/postgresql/server/postgres.h) +.if exists(${LOCALBASE}/bin/pg_config) WITH_PGSQL= yes .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql-includes=${LOCALBASE}/include/postgresql/server \ --with-postgresql-libraries=${LOCALBASE}/lib PLIST_SUB+= PGSQL="" diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index 6de92282d459..499105d57d48 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -256,8 +256,7 @@ PHP_HEADER_DIRS=pcrelib .endif .if ${PHP_MODNAME} == "pgsql" -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 27b1ee61528a..20e4241ddf2d 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -248,8 +248,7 @@ PHP_HEADER_DIRS=pcrelib .endif .if ${PHP_MODNAME} == "pgsql" -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 27b1ee61528a..20e4241ddf2d 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -248,8 +248,7 @@ PHP_HEADER_DIRS=pcrelib .endif .if ${PHP_MODNAME} == "pgsql" -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif diff --git a/lang/pike72/Makefile b/lang/pike72/Makefile index 0e101f698b01..459efc7f967d 100644 --- a/lang/pike72/Makefile +++ b/lang/pike72/Makefile @@ -75,7 +75,7 @@ WITH_FREETYPE= yes WITH_MYSQL= yes .endif -.if exists(${LOCALBASE}/lib/libpq.so.2) +.if exists(${LOCALBASE}/lib/libpq.so) WITH_POSTGRES= yes .endif @@ -130,7 +130,7 @@ CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_POSTGRES) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${PREFIX} .else CONFIGURE_ARGS+= --without-pgsql diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile index 417c2701f613..63da13e0015b 100644 --- a/lang/pike76/Makefile +++ b/lang/pike76/Makefile @@ -154,7 +154,7 @@ CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_POSTGRES) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${PREFIX} .else CONFIGURE_ARGS+= --without-pgsql diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/mail/courier-authlib-vchkpw/Makefile +++ b/mail/courier-authlib-vchkpw/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/mail/courier-authlib/Makefile +++ b/mail/courier-authlib/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/mail/courier/Makefile b/mail/courier/Makefile index c0be3f488302..f67ae8507111 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -79,7 +79,7 @@ CONFIGURE_ARGS= --disable-root-check --with-db=db \ --with-mailgroup=${MAILGRP} \ --with-mailuid=${MAILUID} \ --with-mailgid=${MAILGID} \ - --with-etcdir=${ETCDIR} \ + --with-etcdir=${ETCDIR} \ --sysconfdir=${SYSCONFDIR} \ --with-userdb=${USERDB} \ --datadir=${DATADIR} \ @@ -146,7 +146,7 @@ OPTIONS+=off .endif OPTIONS+=PGSQL "PostgreSQL authentication support" -.if exists(${PGSQLBASE}/lib/libpq.so.3) || defined(WITH_PGSQL) +.if exists(${LOCALBASE}/lib/libpq.so) || defined(WITH_PGSQL) OPTIONS+=on .else OPTIONS+=off @@ -250,10 +250,10 @@ PLIST_SUB+= SUB_MYSQL="@comment " .if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL) PKGNAMESUFFIX!= ${ECHO} ${PKGNAMESUFFIX}-pgsql -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--with-authpgsql \ - --with-pgsql-libs=${PGSQLBASE}/lib \ - --with-pgsql-includes=${PGSQLINCLUDES} + --with-pgsql-libs=${LOCALBASE}/lib \ + --with-pgsql-includes=${LOCALBASE}/include PLIST_SUB+= SUB_PGSQL="" .else CONFIGURE_ARGS+=--without-authpgsql diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile index caadfceefbeb..fb5c362f4bb5 100644 --- a/mail/dbmail-devel/Makefile +++ b/mail/dbmail-devel/Makefile @@ -31,7 +31,7 @@ SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ .if defined(WITH_POSTGRESQL) CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes DATABASE= postgresql PLIST_SUB+= PGSQL="" PLIST_SUB+= MYSQL="@comment " diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index caadfceefbeb..fb5c362f4bb5 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -31,7 +31,7 @@ SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ .if defined(WITH_POSTGRESQL) CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes DATABASE= postgresql PLIST_SUB+= PGSQL="" PLIST_SUB+= MYSQL="@comment " diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile index caadfceefbeb..fb5c362f4bb5 100644 --- a/mail/dbmail20/Makefile +++ b/mail/dbmail20/Makefile @@ -31,7 +31,7 @@ SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ .if defined(WITH_POSTGRESQL) CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes DATABASE= postgresql PLIST_SUB+= PGSQL="" PLIST_SUB+= MYSQL="@comment " diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile index caadfceefbeb..fb5c362f4bb5 100644 --- a/mail/dbmail21/Makefile +++ b/mail/dbmail21/Makefile @@ -31,7 +31,7 @@ SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ .if defined(WITH_POSTGRESQL) CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes DATABASE= postgresql PLIST_SUB+= PGSQL="" PLIST_SUB+= MYSQL="@comment " diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile index caadfceefbeb..fb5c362f4bb5 100644 --- a/mail/dbmail22/Makefile +++ b/mail/dbmail22/Makefile @@ -31,7 +31,7 @@ SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ .if defined(WITH_POSTGRESQL) CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes DATABASE= postgresql PLIST_SUB+= PGSQL="" PLIST_SUB+= MYSQL="@comment " diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile index d4f380244d92..98a0af6fe57b 100644 --- a/mail/dovecot-devel/Makefile +++ b/mail/dovecot-devel/Makefile @@ -96,7 +96,7 @@ CONFIGURE_ARGS+= --with-ldap # can be used to store user tables. # .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql .endif diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index d4f380244d92..98a0af6fe57b 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -96,7 +96,7 @@ CONFIGURE_ARGS+= --with-ldap # can be used to store user tables. # .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql .endif diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index d89a0c827d47..9975836fc47e 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/dspam-cvs-devel${SNAP_DATE} .else WRKSRC= ${WRKDIR}/dspam-${PORTVER_MAJ} .endif - + #SNAP_DATE= .20041225.1815 PORTVER_MAJ= 3.3.4 @@ -50,8 +50,7 @@ OPTIONS+= MYSQL40 "Use MySQL 4.0.x as back-end" on OPTIONS+= MYSQL41 "Use MySQL 4.1.x as back-end" off OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off -OPTIONS+= POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off -OPTIONS+= POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off +OPTIONS+= POSTGRESQL "Use PostgreSQL as back-end" off OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off OPTIONS+= SQLITE2 "Use SQLite v2.x as back-end" off @@ -213,26 +212,8 @@ CONFIGURE_ARGS+= --disable-trusted-user-security DBDRV_TOTAL_COUNT= ooooooooo # 9 DBDRV_COUNT= ${DBDRV_TOTAL_COUNT} -.if defined(WITH_POSTGRESQL73) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql73 -#BUILD_DEPENDS+= ${LIB_DEPENDS} -CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \ - --with-pgsql-includes=${LOCALBASE}/include \ - --with-pgsql-libraries=${LOCALBASE}/lib -PLIST_SUB+= DB4="@comment " -PLIST_SUB+= MYSQL="@comment " -PLIST_SUB+= PGSQL="" -PLIST_SUB+= SQLITE="@comment " -SED_SCRIPT+= -e '/%%MYSQL%%/D' -SED_SCRIPT+= -e 's,%%PGSQL%%,,g' -SED_SCRIPT+= -e '/%%SQLITE%%/D' -#PKGNAMESUFFIX= -pgsql73 -DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} -.endif - -.if defined(WITH_POSTGRESQL74) -LIB_DEPENDS+= ecpg.4:${PORTSDIR}/databases/postgresql7 -#BUILD_DEPENDS+= ${LIB_DEPENDS} +.if defined(WITH_POSTGRESQL) +USE_PGSQL= YES CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \ --with-pgsql-includes=${LOCALBASE}/include \ --with-pgsql-libraries=${LOCALBASE}/lib @@ -243,7 +224,7 @@ PLIST_SUB+= SQLITE="@comment " SED_SCRIPT+= -e '/%%MYSQL%%/D' SED_SCRIPT+= -e 's,%%PGSQL%%,,g' SED_SCRIPT+= -e '/%%SQLITE%%/D' -#PKGNAMESUFFIX= -pgsql74 +#PKGNAMESUFFIX= -pgsql DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif @@ -361,7 +342,7 @@ LDA_COUNT:= ${LDA_COUNT:S/o//} .if defined(WITH_EXIM_LDA) . if defined(WITH_MYSQL40) || (WITH_MYSQL41) _EXIM_EXT= -mysql -. elseif defined(WITH_POSTGRESQL74) || defined(WITH_POSTGRESQL73) +. elseif defined(WITH_POSTGRESQL) #### ### fix me for pg 7.3: how to pass the db option to exim port ? ### @@ -457,16 +438,6 @@ pre-everything:: @${ECHO_CMD} "" pre-extract: -.if defined(WITH_EXIM_LDA) && defined(WITH_POSTGRESQL73) - @${ECHO_CMD} "******************************************************************" - @${ECHO_CMD} "You have both EXIM_LDA and POSTGRESQL73 defined. To have exim" - @${ECHO_CMD} "built with the right pgsql please hit Ctrl-C now and do:" - @${ECHO_CMD} "cd ${PORTSDIR}/mail/exim-postgresql && make POSTGRESQL_PORT=postgresql73 inst - @${ECHO_CMD} "then return here and do:" - @${ECHO_CMD} "make clean && make install" - @${ECHO_CMD} "******************************************************************" - @${ECHO_CMD} "" -.endif @${ECHO_CMD} "Define vars below before make-ing if you need:" @${ECHO_CMD} "" @${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)" @@ -540,22 +511,22 @@ pre-configure: @${ECHO_CMD} "You can use one and only one database back-end at once." @${FALSE} .endif -.if defined(WITH_NEURAL_NET) && !(defined(USE_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)) +.if defined(WITH_NEURAL_NET) && !(defined(USE_MYSQL) || defined(WITH_POSTGRESQL)) @${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking." @${FALSE} .endif .if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \ - defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE)) + defined(WITH_POSTGRESQL) || defined(WITH_ORACLE)) @${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users." @${FALSE} .endif .if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \ - defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) ) + defined(WITH_POSTGRESQL) ) @${ECHO_CMD} "You need MySQL or Postgres for preferences extension" @${FALSE} .endif .if defined(WITH_DAEMON) && !( defined(USE_MYSQL) || \ - defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) ) + defined(WITH_POSTGRESQL) ) @${ECHO_CMD} "You need MySQL or Postgres for Daemon mode, because multithreading support is needed" @${FALSE} .endif @@ -588,7 +559,7 @@ post-install: @${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql @${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql .endif -.if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) +.if defined(WITH_POSTGRESQL) @${MKDIR} ${EXAMPLESDIR}/pgsql @cd ${WRKSRC}/src/tools.pgsql_drv && \ ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index e6ca8c2788b2..d1f0a974a147 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -56,8 +56,7 @@ OPTIONS+= MYSQL40 "Use MySQL 4.0.x as back-end" off OPTIONS+= MYSQL41 "Use MySQL 4.1.x as back-end" off OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off -OPTIONS+= POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off -OPTIONS+= POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off +OPTIONS+= POSTGRESQL "Use PostgreSQL as back-end" off OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off OPTIONS+= SQLITE2 "Use SQLite v2.x as back-end" on @@ -221,9 +220,8 @@ CONFIGURE_ARGS+= --enable-client-compression .endif .endif -.if defined(WITH_POSTGRESQL73) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql73 -#BUILD_DEPENDS= ${LIB_DEPENDS} +.if defined(WITH_POSTGRESQL) +USE_PGSQL= yes CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \ --with-pgsql-includes=${LOCALBASE}/include \ --with-pgsql-libraries=${LOCALBASE}/lib @@ -234,24 +232,7 @@ PLIST_SUB+= SQLITE="@comment " SED_SCRIPT+= -e '/%%MYSQL%%/D' SED_SCRIPT+= -e 's,%%PGSQL%%,,g' SED_SCRIPT+= -e '/%%SQLITE%%/D' -#PKGNAMESUFFIX= -pgsql73 -DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} -.endif - -.if defined(WITH_POSTGRESQL74) -LIB_DEPENDS+= ecpg.4:${PORTSDIR}/databases/postgresql7 -#BUILD_DEPENDS= ${LIB_DEPENDS} -CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \ - --with-pgsql-includes=${LOCALBASE}/include \ - --with-pgsql-libraries=${LOCALBASE}/lib -PLIST_SUB+= DB4="@comment " -PLIST_SUB+= MYSQL="@comment " -PLIST_SUB+= PGSQL="" -PLIST_SUB+= SQLITE="@comment " -SED_SCRIPT+= -e '/%%MYSQL%%/D' -SED_SCRIPT+= -e 's,%%PGSQL%%,,g' -SED_SCRIPT+= -e '/%%SQLITE%%/D' -#PKGNAMESUFFIX= -pgsql74 +#PKGNAMESUFFIX= -pgsql DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif @@ -329,10 +310,7 @@ LDA_COUNT:= ${LDA_COUNT:S/o//} .if defined(WITH_EXIM_LDA) . if defined(WITH_MYSQL40) || (WITH_MYSQL41) _EXIM_EXT= -mysql -. elseif defined(WITH_POSTGRESQL74) || defined(WITH_POSTGRESQL73) -#### -### fix me for pg 7.3: how to pass the db option to exim port ? -### +. elseif defined(WITH_POSTGRESQL) _EXIM_EXT= -postgresql . endif RUN_DEPENDS+= exim:${PORTSDIR}/mail/exim${_EXIM_EXT} @@ -433,17 +411,6 @@ post-fetch: .endif pre-extract: -.if defined(WITH_EXIM_LDA) && defined(WITH_POSTGRESQL73) - @${ECHO_CMD} "******************************************************************" - @${ECHO_CMD} "You have both EXIM_LDA and POSTGRESQL73 defined. To have exim" - @${ECHO_CMD} "built with the right pgsql please hit Ctrl-C now and do:" - @${ECHO_CMD} "cd ${PORTSDIR}/mail/exim-postgresql && make POSTGRESQL_PORT=postgresql73 install" - @${ECHO_CMD} "then return here and do:" - @${ECHO_CMD} "make clean && make install" - @${ECHO_CMD} "******************************************************************" - @${ECHO_CMD} "" -.endif - @${ECHO_CMD} "Define vars below before make-ing if you need:" @${ECHO_CMD} "" @${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)" @@ -512,17 +479,17 @@ pre-configure: @${ECHO_CMD} "You can use one and only one database back-end at once." @${FALSE} .endif -.if defined(WITH_NEURAL_NET) && !(defined(HAVE_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)) +.if defined(WITH_NEURAL_NET) && !(defined(HAVE_MYSQL) || defined(WITH_POSTGRESQL)) @${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking." @${FALSE} .endif .if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \ - defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE)) + defined(WITH_POSTGRESQL) || defined(WITH_ORACLE)) @${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users." @${FALSE} .endif .if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \ - defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) ) + defined(WITH_POSTGRESQL) ) @${ECHO_CMD} "You need MySQL or Postgres for preferences extension" @${FALSE} .endif @@ -549,7 +516,7 @@ post-install: @${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql @${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql .endif -.if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) +.if defined(WITH_POSTGRESQL) @${MKDIR} ${EXAMPLESDIR}/pgsql @cd ${WRKSRC}/tools.pgsql_drv && \ ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 9d29dc2bba5c..54a701e8cc82 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -420,14 +420,8 @@ IGNORE= WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,,' .endif -.if defined(WITH_POSTGRESQL_PORT) && ${WITH_POSTGRESQL_PORT:L} != "auto" -POSTGRESQL_PORT= ${WITH_POSTGRESQL_PORT} -.else -POSTGRESQL_PORT?= databases/postgresql7 -.endif - .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \ -e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE}/include/pgsql,' \ -e 's,^\# (LOOKUP_PGSQL=),\1,' diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index a74f5a7fca09..83190a56855e 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -40,8 +40,7 @@ EXTRACT_INCLUDE+= -I${LOCALBASE}/include/mysql EXTRACT_LIB+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lm .elif defined(WITH_POSTGRESQL) ALL_TARGET= pgsql it ${LANGUAGE} -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes EXTRACT_INCLUDE+= -I${LOCALBASE}/include EXTRACT_LIB+= -L${LOCALBASE}/lib -lpq -lcrypt .else diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index c311ff7a1492..af46a72e48f7 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -111,7 +111,7 @@ PLIST_SUB+= MYSQL="@comment " .if defined(WITH_PGSQL) CONFIGURE_ARGS+= --enable-pg -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes PLIST_SUB+= PGSQL="" MAN8+= perditiondb_postgresql_makedb.8 .else diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile index f9ecd211c8a4..1a40f56e8efa 100644 --- a/mail/teapop-devel/Makefile +++ b/mail/teapop-devel/Makefile @@ -66,8 +66,8 @@ MAN8= teapop.8 ## .if defined(WITH_PGSQL) +USE_PGSQL= YES CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 .endif .if defined(WITH_MYSQL) diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile index 4984792f0245..2a55f350c0b1 100644 --- a/mail/teapop/Makefile +++ b/mail/teapop/Makefile @@ -64,8 +64,8 @@ MAN8= teapop.8 ## .if defined(WITH_PGSQL) +USE_PGSQL= YES CONFIGURE_ARGS+= --with-pgsql -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 .endif .if defined(WITH_MYSQL) diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile index bdda209ab4c6..e4dab9ec5028 100644 --- a/mail/vpopmail-devel/Makefile +++ b/mail/vpopmail-devel/Makefile @@ -160,8 +160,7 @@ WITH_PGSQL= yes .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --enable-auth-module=pgsql .if defined(WITH_PGSQL_LOG) diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 3295e05413db..5a46eb883be0 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -161,8 +161,7 @@ WITH_PGSQL= yes .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --enable-auth-module=pgsql .if defined(WITH_PGSQL_LOG) diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 6f595c736b45..0406b8424489 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--enable-debug .endif .if defined(WITH_POSTGRESQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql .else CONFIGURE_ARGS+=--disable-pgsql diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index 7419791fcb1b..4c1663f1fbf0 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -81,8 +81,7 @@ PLIST_SUB+= SUB_MYSQL="@comment " .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?=databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} PLIST_SUB+= SUB_PGSQL="" .else diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 58d5af39282d..9c89111ae5b5 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -68,7 +68,7 @@ CONFIGURE_ARGS+=--with-file-perfdata .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile index 58d5af39282d..9c89111ae5b5 100644 --- a/net-mgmt/nagios12/Makefile +++ b/net-mgmt/nagios12/Makefile @@ -68,7 +68,7 @@ CONFIGURE_ARGS+=--with-file-perfdata .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index 58d5af39282d..9c89111ae5b5 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -68,7 +68,7 @@ CONFIGURE_ARGS+=--with-file-perfdata .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile index 9328db12de78..c998c3c98de2 100644 --- a/net-mgmt/netsaint/Makefile +++ b/net-mgmt/netsaint/Makefile @@ -46,8 +46,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \ .endif .if defined(WITH_POSTGRES) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/lib \ --with-pgsql-inc=${LOCALBASE}/include \ --with-pgsql-xdata diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index d33e30b2ec2b..bb35d9eef90a 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -23,7 +23,7 @@ PLIST_SUB+= WITH_MYSQL="@comment " .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql PLIST_SUB+= WITH_PGSQL="" .else diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile index 347cfd271cf5..c5b62da6c941 100644 --- a/net-mgmt/zabbix/Makefile +++ b/net-mgmt/zabbix/Makefile @@ -45,8 +45,8 @@ IGNORE= You should configure to use either a MySQL or PostgreSQL backend .endif .ifdef(WITH_PGSQL) +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 .endif .ifndef(WITHOUT_MYSQL) USE_MYSQL= yes diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile index 347cfd271cf5..c5b62da6c941 100644 --- a/net-mgmt/zabbix2/Makefile +++ b/net-mgmt/zabbix2/Makefile @@ -45,8 +45,8 @@ IGNORE= You should configure to use either a MySQL or PostgreSQL backend .endif .ifdef(WITH_PGSQL) +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 .endif .ifndef(WITHOUT_MYSQL) USE_MYSQL= yes diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 825e46d31617..f75ba20a6795 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -62,8 +62,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .ifdef(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQL="" .else CONFIGURE_ARGS+=--without-rlm_sql_postgresql diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 825e46d31617..f75ba20a6795 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -62,8 +62,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .ifdef(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQL="" .else CONFIGURE_ARGS+=--without-rlm_sql_postgresql diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile index 6f595c736b45..0406b8424489 100644 --- a/net/jabberd/Makefile +++ b/net/jabberd/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--enable-debug .endif .if defined(WITH_POSTGRESQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql .else CONFIGURE_ARGS+=--disable-pgsql diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 941b7163ca18..fdfe52ba9214 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -155,7 +155,7 @@ PLIST_SUB+= SAMMYSQL="@comment " .endif .if defined(WITH_SAM_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql-prefix=${LOCALBASE} WANT_EXPSAM_MODULES+= pgsql PLIST_SUB+= SAMPGSQL="" diff --git a/net/ser/Makefile b/net/ser/Makefile index c413f0ea17bb..b2f3c863ec5f 100644 --- a/net/ser/Makefile +++ b/net/ser/Makefile @@ -15,14 +15,12 @@ MAINTAINER= sobomax@FreeBSD.org COMMENT= A very fast and configurable SIP proxy BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= radiusclient.2:${PORTSDIR}/net/radiusclient \ - pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +LIB_DEPENDS= radiusclient.2:${PORTSDIR}/net/radiusclient RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -POSTGRESQL_PORT?= databases/postgresql7 - +USE_PGSQL= yes USE_GMAKE= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/news/nntpswitch/Makefile b/news/nntpswitch/Makefile index 4a0b1d9e1aa3..98f910eb8c07 100644 --- a/news/nntpswitch/Makefile +++ b/news/nntpswitch/Makefile @@ -38,7 +38,7 @@ PLIST_FILES+= lib/libauth_mysql.so .endif .if defined(WITH_POSTGRESQL) -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= YES ALL_TARGET+= postgres PLIST_FILES+= lib/libauth_postgres.so .endif diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile index 8f2c3d893236..7af12d8a1c05 100644 --- a/print/kaspaliste/Makefile +++ b/print/kaspaliste/Makefile @@ -7,6 +7,7 @@ PORTNAME= kaspaliste PORTVERSION= 0.96 +PORTREVISION= 1 CATEGORIES= print kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kaspaliste @@ -14,8 +15,7 @@ MASTER_SITE_SUBDIR= kaspaliste MAINTAINER= jaapb@kerguelen.org COMMENT= Bibliography tool for KDE/Postgres/BibTeX -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 - +USE_PGSQL= yes USE_KDEBASE_VER= 3 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/russian/nagios/Makefile b/russian/nagios/Makefile index 96cbf522daed..7dc0162d7849 100644 --- a/russian/nagios/Makefile +++ b/russian/nagios/Makefile @@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--with-file-perfdata .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata diff --git a/security/audit/Makefile b/security/audit/Makefile index b3a73abc43bb..d44d52c6300f 100644 --- a/security/audit/Makefile +++ b/security/audit/Makefile @@ -24,8 +24,7 @@ OPTIONS= MYSQL "With MySQL support" off \ USE_MYSQL= yes .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes .endif WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION}beta diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/security/courier-authlib-base/Makefile +++ b/security/courier-authlib-base/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 71952f4da9b4..ea2c8c5b15a5 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \ CONFIGURE_ARGS+=--without-authpgsql PLIST_SUB+= PGSQLFLAG="@comment " .else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES PLIST_SUB+= PGSQLFLAG="" .endif diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index e09df1ecd549..e8b2fbe43112 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -90,8 +90,7 @@ CONFIGURE_ARGS+=--without-mysql .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .else CONFIGURE_ARGS+=--without-pgsql diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile index 07f845180bff..386633ca0bcc 100644 --- a/security/pam-pgsql/Makefile +++ b/security/pam-pgsql/Makefile @@ -7,7 +7,7 @@ PORTNAME= pam-pgsql PORTVERSION= 0.5.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= security databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -21,9 +21,7 @@ PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} mat/:local MAINTAINER= ports@FreeBSD.org COMMENT= A pam module for authenticating with PostgreSQL -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} - -POSTGRESQL_PORT?= databases/postgresql7 +USE_PGSQL= yes PATCH_DIST_STRIP= -p1 diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index bb17831a8609..4e89bd7a8d76 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -39,7 +39,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_POSTGRES) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= YES CONFIGURE_ARGS+= --enable-pgsql PLIST_SUB+= PGSQL="" .else diff --git a/security/snort/Makefile b/security/snort/Makefile index 7e053b006f2b..36721fe26d28 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -58,8 +58,7 @@ CONFIGURE_ARGS+= --with-odbc=no .endif .if defined(WITH_POSTGRESQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a) LDFLAGS+= -lssl -lcrypto diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index e0a82a38eacd..0bbb38cc72cd 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -56,7 +56,7 @@ OPTIONS+= WXCONSOLE "Build with wxGTK based GUI console" off OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console" off .else OPTIONS= MYSQL "Use MySQL database instead of SqLite" off -OPTIONS+= POSTGRESQL7 "Use PostgreSQL 7.X database instead of SqLite" off +OPTIONS+= POSTGRESQL "Use PostgreSQL database instead of SqLite" off OPTIONS+= MTX "Install mtx for control of autochanger devices" off .endif @@ -107,9 +107,9 @@ CONFFILES= sd dir CONFIGURE_ARGS+= --with-mysql=yes USE_MYSQL= yes DBTYPE= mysql -.elif defined(WITH_POSTGRESQL7) +.elif defined(WITH_POSTGRESQL) +USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=yes -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 DBTYPE= postgresql .else CONFIGURE_ARGS+= --with-sqlite=yes @@ -136,9 +136,9 @@ pre-everything:: @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console." @${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console." @${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control." -.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL7) +.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL) @${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL instead of SqLite as the database." - @${ECHO_MSG} " WITH_POSTGRESQL7=yes if you want PostgreSQL 7.X instead of SqLite as the database." + @${ECHO_MSG} " WITH_POSTGRESQL=yes if you want PostgreSQL instead of SqLite as the database." @${ECHO_MSG} "" @${ECHO_MSG} "The default DB is SQLite!" .endif diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile index 4766fa2aadd6..b2d366c74480 100644 --- a/sysutils/msyslog/Makefile +++ b/sysutils/msyslog/Makefile @@ -21,8 +21,7 @@ COMMENT= Flexible and easy to integrate syslog daemon LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client .endif .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes .endif GNU_CONFIGURE= yes diff --git a/www/MT/Makefile b/www/MT/Makefile index 4c238537259a..c81a37d4953b 100644 --- a/www/MT/Makefile +++ b/www/MT/Makefile @@ -37,8 +37,7 @@ USE_MYSQL= yes .elif defined(WITH_POSTGRES) DB_DIR?= ${PREFIX}/pgsql/data/blog # Or somewhere defined in $PGDATA - -RUN_DEPENDS+= postgres:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= yes .elif defined(WITH_SQLITE) DB_DIR?= ${PREFIX}/${CGIDIR}/db RUN_DEPENDS+=\ diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile index 3aa25ca9cae1..a505a96935b4 100644 --- a/www/dpsearch/Makefile +++ b/www/dpsearch/Makefile @@ -36,9 +36,9 @@ OPTIONS= DPSEARCH_THREADS "Enable pthreads" on \ DPSEARCH_CHASEN "Enable ChaSen japanese analyzer" off \ DPSEARCH_APACHE "Enable mod_dpsearch for Apache" off \ DPSEARCH_IDN "Enable Internationalized Domain Names" off \ - DPSEARCH_PGSQL "Use PGSQL (mutually exclusive)" off \ - DPSEARCH_MYSQL "Use MySQL (mutually exclusive)" on \ - DPSEARCH_SQLITE "Use SQLite (mutually exclusive)" off \ + DPSEARCH_PGSQL "Use PostgreSQL (mutually exclusive)" off \ + DPSEARCH_MYSQL "Use MySQL (mutually exclusive)" on \ + DPSEARCH_SQLITE "Use SQLite (mutually exclusive)" off .include <bsd.port.pre.mk> @@ -109,8 +109,7 @@ pre-fetch: .endif .if defined(WITH_DPSEARCH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} .elif defined(WITH_DPSEARCH_MYSQL) diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index e0626ece7db7..88016f293055 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -64,8 +64,7 @@ CONFIGURE_ARGS+= --enable-charset-guesser .endif .if defined(WITH_MNOGO_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} .elif defined(WITH_MNOGO_MSQL) diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile index e0626ece7db7..88016f293055 100644 --- a/www/mnogosearch31/Makefile +++ b/www/mnogosearch31/Makefile @@ -64,8 +64,7 @@ CONFIGURE_ARGS+= --enable-charset-guesser .endif .if defined(WITH_MNOGO_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} .elif defined(WITH_MNOGO_MSQL) diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile index 820d484f8936..fb98c8c80ed4 100644 --- a/www/mod_accounting/Makefile +++ b/www/mod_accounting/Makefile @@ -22,7 +22,7 @@ MAKE_ARGS+= APXS="${APXS}" .if defined(WITHOUT_PGSQL) MAKE_ARGS+= WITHOUT_PGSQL=YES .else -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +USE_PGSQL= YES .endif .if defined(WITHOUT_MYSQL) diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile index 32ea83c2163f..34e02bc85cca 100644 --- a/www/mod_auth_pgsql/Makefile +++ b/www/mod_auth_pgsql/Makefile @@ -6,7 +6,7 @@ PORTNAME= mod_auth_pgsql PORTVERSION= 0.9.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/ @@ -15,14 +15,13 @@ COMMENT= Allows users to use PostgreSQL databases for user authentication BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} + +USE_PGSQL= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} .include <bsd.port.pre.mk> -POSTGRESQL_PORT?= databases/postgresql7 - .if exists(${APXS}) APXS_WORKS!= ${APXS} -q TARGET 2>/dev/null || echo no .endif diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile index fa2f980128d1..ad523b7cd998 100644 --- a/www/mod_auth_pgsql2/Makefile +++ b/www/mod_auth_pgsql2/Makefile @@ -6,7 +6,7 @@ PORTNAME= mod_auth_pgsql PORTVERSION= 2.0.2b1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/ @@ -15,7 +15,8 @@ COMMENT= Allows users to use PostgreSQL databases for user authentication BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 RUN_DEPENDS= ${BUILD_DEPENDS} -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 + +USE_PGSQL= yes LATEST_LINK= mod_auth_pgsql2 diff --git a/www/nspostgres/Makefile b/www/nspostgres/Makefile index 333d3ba69a07..1f4a736cb7b9 100644 --- a/www/nspostgres/Makefile +++ b/www/nspostgres/Makefile @@ -7,7 +7,7 @@ PORTNAME= nspostgres PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= aolserver @@ -16,11 +16,10 @@ DISTNAME= nspostgres3_0 MAINTAINER= jkoshy@freebsd.org COMMENT= A driver to access PostgreSQL databases from Aolserver -BUILD_DEPENDS= ${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver \ - ${LOCALBASE}/bin/postmaster:${PORTSDIR}/${POSTGRESQL_PORT} +BUILD_DEPENDS= ${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver RUN_DEPENDS= ${BUILD_DEPENDS} -POSTGRESQL_PORT?= databases/postgresql7 +USE_PGSQL= yes WRKSRC= ${WRKDIR}/nspostgres diff --git a/www/pgdriver/Makefile b/www/pgdriver/Makefile index a5b357a1a364..a48727c356ac 100644 --- a/www/pgdriver/Makefile +++ b/www/pgdriver/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgdriver PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www databases MASTER_SITES= http://openacs.org/sdm/download-package/2/38/ EXTRACT_SUFX= .tgz @@ -15,11 +15,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= jkoshy@freebsd.org COMMENT= A driver for AOLserver to PostgreSQL connectivity -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} BUILD_DEPENDS= ${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver RUN_DEPENDS= ${BUILD_DEPENDS} -POSTGRESQL_PORT?= databases/postgresql7 +USE_PGSQL= yes MAKEFILE= makefile MAKE_ENV+= PREFIX=${PREFIX} diff --git a/www/pglogd/Makefile b/www/pglogd/Makefile index c780100c070a..77243ebddde3 100644 --- a/www/pglogd/Makefile +++ b/www/pglogd/Makefile @@ -7,14 +7,14 @@ PORTNAME= pglogd PORTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= www databases MASTER_SITES= http://www.digitalstratum.com/pglogd/ MAINTAINER= allie@pajunas.com COMMENT= Sends web server log entries to a PostgreSQL database -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 - +USE_PGSQL= yes USE_REINPLACE= yes post-extract: diff --git a/www/rt2/Makefile b/www/rt2/Makefile index 9501f344e8ad..6a69d12a01e1 100644 --- a/www/rt2/Makefile +++ b/www/rt2/Makefile @@ -45,8 +45,7 @@ RT_VERSION= ${PORTVERSION:C/\./-/g} DB_TYPE?= mysql .if ${DB_TYPE} == "Pg" -BUILD_DEPENDS+= ${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \ - ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg .else DB_TYPE= mysql BUILD_DEPENDS+= ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-server diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile index 14dbc6ac3692..196739e2dac3 100644 --- a/www/udmsearch/Makefile +++ b/www/udmsearch/Makefile @@ -27,8 +27,7 @@ CONFIGURE_ARGS= --enable-charset-guesser \ --localstatedir=/var/udmsearch .if defined(WITH_PGSQL) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +USE_PGSQL= YES CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}/pgsql .elif defined(WITH_MSQL) |