ports/56342: postgresql-contrib updated, added scripts

Wed Sep 3 13:00:33 UTC 2003

The following reply was made to PR ports/56342; it has been noted by GNATS.

From: "Sergey A. Osokin" <osa at FreeBSD.org>
To: Palle Girgensohn <girgen at pingpong.net>
Cc: FreeBSD-gnats-submit at FreeBSD.org
Subject: Re: ports/56342: postgresql-contrib updated, added scripts
Date: Wed, 3 Sep 2003 16:58:36 +0400

 On Wed, Sep 03, 2003 at 02:24:19AM +0200, Palle Girgensohn wrote:
 > >Number:         56342

 Please approve following patch.
 Thanks.

 Index: ports/databases/postgresql-contrib/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/postgresql-contrib/Makefile,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile
 --- ports/databases/postgresql-contrib/Makefile	24 Aug 2003 12:17:02 -0000	1.1
 +++ ports/databases/postgresql-contrib/Makefile	3 Sep 2003 12:53:54 -0000
 @@ -4,21 +4,29 @@
  #
  # $FreeBSD: ports/databases/postgresql-contrib/Makefile,v 1.1 2003/08/24 12:17:02 edwin Exp $
  #
 +POSTGRESQL_PORT?=	databases/postgresql7

 -PORTNAME=	postgresql-contrib
 -PORTREVISION=	0
 +PORTNAME=	postgresql
 +PORTVERSION!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V PORTVERSION
 +PORTREVISION?=	1
  CATEGORIES=	databases
 +MASTER_SITES=	${MASTER_SITE_PGSQL}
 +MASTER_SITE_SUBDIR!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V MASTER_SITE_SUBDIR
 +PKGNAMESUFFIX=	-contrib
 +DISTFILES!=	${MAKE} -C ${.CURDIR}/../../${POSTGRESQL_PORT} -V DISTFILES
 +DIST_SUBDIR=	postgresql

  MAINTAINER=	girgen at pingpong.net
  COMMENT=	The contrib utilities from the PostgreSQL distribution

  LIB_DEPENDS=	pq:${PORTSDIR}/${POSTGRESQL_PORT}

 -POSTGRESQL_PORT?=	databases/postgresql7
 -POSTGRESQL_SUBPORT=YES
 -.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
 -
 +USE_BISON=	YES
  INSTALLS_SHLIB=	yes
 +MD5_FILE=	${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
 +
 +USE_GMAKE=	YES
 +GNU_CONFIGURE=	YES

  CONFIGURE_ARGS=	--with-libraries=${LOCALBASE}/lib \
  		--with-includes=${LOCALBASE}/include \
 @@ -30,6 +38,10 @@
  	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h

  post-install:
 +	@ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\
 +	  ${INSTALL_DATA} ${WRKSRC}/contrib/ipc_check/README ${PREFIX}/share/doc/postgresql/contrib/README.ipc_check ;\
 +	  ${INSTALL_SCRIPT} ${WRKSRC}/contrib/reindexdb/reindexdb ${PREFIX}/bin/reindexdb ;\
 +	  ${INSTALL_DATA} ${WRKSRC}/contrib/reindexdb/README ${PREFIX}/share/doc/postgresql/contrib/README.reindexdb
  	@ ${INSTALL_DATA} ${WRKSRC}/contrib/README \
  			  ${PREFIX}/share/doc/postgresql/contrib/README
  	@ ${ECHO} ==================================== ;\
 Index: ports/databases/postgresql-contrib/pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/databases/postgresql-contrib/pkg-plist,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-plist
 --- ports/databases/postgresql-contrib/pkg-plist	24 Aug 2003 12:17:02 -0000	1.1
 +++ ports/databases/postgresql-contrib/pkg-plist	3 Sep 2003 12:54:34 -0000
 @@ -13,11 +13,13 @@
  bin/dbf2pg
  bin/findoidjoins
  bin/fti.pl
 +bin/ipc_check
  bin/make_oidjoins_check
  bin/oid2name
  bin/pg_dumplo
  bin/pg_logger
  bin/pgbench
 +bin/reindexdb
  bin/vacuumlo
  lib/postgresql/_int.so
  lib/postgresql/array_iterator.so
 @@ -50,50 +52,52 @@
  lib/postgresql/timetravel.so
  lib/postgresql/tsearch.so
  lib/postgresql/user_locks.so
 -share/doc/postgresql/contrib/README
 -share/doc/postgresql/contrib/README.apachelog
 -share/doc/postgresql/contrib/README.array_iterator
 -share/doc/postgresql/contrib/README.btree_gist
 -share/doc/postgresql/contrib/README.chkpass
 -share/doc/postgresql/contrib/README.cube
 -share/doc/postgresql/contrib/README.dbf2pg
 -share/doc/postgresql/contrib/README.dblink
 -share/doc/postgresql/contrib/README.dbmirror
 -share/doc/postgresql/contrib/README.dbsize
 -share/doc/postgresql/contrib/README.earthdistance
 -share/doc/postgresql/contrib/README.findoidjoins
 -share/doc/postgresql/contrib/README.fti
 -share/doc/postgresql/contrib/README.fuzzystrmatch
 -share/doc/postgresql/contrib/README.int_aggregate
 -share/doc/postgresql/contrib/README.intarray
 -share/doc/postgresql/contrib/README.isbn_issn
 -share/doc/postgresql/contrib/README.lo
 -share/doc/postgresql/contrib/README.ltree
 -share/doc/postgresql/contrib/README.misc_utils
 -share/doc/postgresql/contrib/README.noup
 -share/doc/postgresql/contrib/README.oid2name
 -share/doc/postgresql/contrib/README.pg_dumplo
 -share/doc/postgresql/contrib/README.pg_logger
 -share/doc/postgresql/contrib/README.pgbench
 -share/doc/postgresql/contrib/README.pgbench_jis
 -share/doc/postgresql/contrib/README.pgcrypto
 -share/doc/postgresql/contrib/README.pgstattuple
 -share/doc/postgresql/contrib/README.pgstattuple.euc_jp
 -share/doc/postgresql/contrib/README.rserv
 -share/doc/postgresql/contrib/README.rtree_gist
 -share/doc/postgresql/contrib/README.seg
 -share/doc/postgresql/contrib/README.soundex
 -share/doc/postgresql/contrib/README.spi
 -share/doc/postgresql/contrib/README.string_io
 -share/doc/postgresql/contrib/README.tablefunc
 -share/doc/postgresql/contrib/README.tsearch
 -share/doc/postgresql/contrib/README.user_locks
 -share/doc/postgresql/contrib/README.vacuumlo
 -share/doc/postgresql/contrib/autoinc.example
 -share/doc/postgresql/contrib/insert_username.example
 -share/doc/postgresql/contrib/moddatetime.example
 -share/doc/postgresql/contrib/refint.example
 -share/doc/postgresql/contrib/timetravel.example
 +%%DOCSDIR%%/contrib/README
 +%%DOCSDIR%%/contrib/README.apachelog
 +%%DOCSDIR%%/contrib/README.array_iterator
 +%%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_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.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/array_iterator.sql
 @@ -130,6 +134,6 @@
  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
 - at unexec rmdir %D/share/doc/postgresql/contrib >&2 2> /dev/null || true
 - at unexec rmdir %D/share/doc/postgresql >&2 2> /dev/null || true
 + at unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
 + at unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
  @unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true

 -- 

 Rgdz,                        /"\  ASCII RIBBON CAMPAIGN
 Sergey Osokin aka oZZ,       \ /    AGAINST HTML MAIL
 http://ozz.pp.ru/             X          AND NEWS
                              / \