3 files changed, 24 insertions, 167 deletions

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