From owner-svn-ports-head@FreeBSD.ORG Wed Feb 26 17:24:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EAB2E1AF; Wed, 26 Feb 2014 17:24:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D14641281; Wed, 26 Feb 2014 17:24:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QHOeba015275; Wed, 26 Feb 2014 17:24:40 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QHOaL9015244; Wed, 26 Feb 2014 17:24:36 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201402261724.s1QHOaL9015244@svn.freebsd.org> From: Antoine Brodin Date: Wed, 26 Feb 2014 17:24:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346217 - in head/databases: postgresql84-client postgresql84-contrib postgresql84-docs postgresql84-plperl postgresql84-plpython postgresql84-pltcl postgresql84-server postgresql90-cli... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 17:24:41 -0000 Author: antoine Date: Wed Feb 26 17:24:35 2014 New Revision: 346217 URL: http://svnweb.freebsd.org/changeset/ports/346217 QAT: https://qat.redports.org/buildarchive/r346217/ Log: Stage support Reviewed by: postgresql@ Tested by: miwi and me Modified: head/databases/postgresql84-client/Makefile head/databases/postgresql84-contrib/Makefile head/databases/postgresql84-docs/Makefile head/databases/postgresql84-plperl/Makefile head/databases/postgresql84-plpython/Makefile head/databases/postgresql84-pltcl/Makefile head/databases/postgresql84-server/Makefile head/databases/postgresql84-server/pkg-plist-client head/databases/postgresql90-client/Makefile head/databases/postgresql90-contrib/Makefile head/databases/postgresql90-docs/Makefile head/databases/postgresql90-plperl/Makefile head/databases/postgresql90-plpython/Makefile head/databases/postgresql90-pltcl/Makefile head/databases/postgresql90-server/Makefile head/databases/postgresql90-server/pkg-plist-client head/databases/postgresql91-client/Makefile head/databases/postgresql91-contrib/Makefile head/databases/postgresql91-docs/Makefile head/databases/postgresql91-plperl/Makefile head/databases/postgresql91-pltcl/Makefile head/databases/postgresql91-server/Makefile head/databases/postgresql91-server/pkg-plist-client head/databases/postgresql91-server/pkg-plist-server head/databases/postgresql92-client/Makefile head/databases/postgresql92-contrib/Makefile head/databases/postgresql92-docs/Makefile head/databases/postgresql92-plperl/Makefile head/databases/postgresql92-pltcl/Makefile head/databases/postgresql92-server/Makefile head/databases/postgresql92-server/pkg-plist-client head/databases/postgresql93-client/Makefile head/databases/postgresql93-contrib/Makefile head/databases/postgresql93-docs/Makefile head/databases/postgresql93-plperl/Makefile head/databases/postgresql93-pltcl/Makefile head/databases/postgresql93-server/Makefile head/databases/postgresql93-server/pkg-plist-client Modified: head/databases/postgresql84-client/Makefile ============================================================================== --- head/databases/postgresql84-client/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-client/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -16,5 +16,4 @@ CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql84-contrib/Makefile ============================================================================== --- head/databases/postgresql84-contrib/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-contrib/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -25,8 +25,7 @@ SLAVE_ONLY= yes COMPONENT= -contrib CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl -NO_STAGE= yes post-install: - @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README + @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/contrib/README .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql84-docs/Makefile ============================================================================== --- head/databases/postgresql84-docs/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-docs/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -21,11 +21,10 @@ PATCHDIR= mustnotexist PGDOCSDIR?= ${DOCSDIR}/release-${PGSQL_VER} -NO_STAGE= yes do-install: - @ $(MKDIR) ${PGDOCSDIR}; \ + @ $(MKDIR) ${STAGEDIR}${PGDOCSDIR}; \ ${GZIP_CMD} -dc ${WRKSRC}/doc/postgres.tar.gz | \ - ( cd ${PGDOCSDIR} && $(TAR) xf - ) + ( cd ${STAGEDIR}${PGDOCSDIR} && $(TAR) xf - ) post-install: @ ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} -v /$$ | \ Modified: head/databases/postgresql84-plperl/Makefile ============================================================================== --- head/databases/postgresql84-plperl/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-plperl/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -3,5 +3,4 @@ WANT_PGSQL_VER= 84 -NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql84-plpython/Makefile ============================================================================== --- head/databases/postgresql84-plpython/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-plpython/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -3,5 +3,4 @@ USE_PYTHON= 2 WANT_PGSQL_VER= 84 -NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plpython/Makefile" Modified: head/databases/postgresql84-pltcl/Makefile ============================================================================== --- head/databases/postgresql84-pltcl/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-pltcl/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -3,5 +3,4 @@ WANT_PGSQL_VER?=84 -NO_STAGE= yes .include "${.CURDIR}/../postgresql91-pltcl/Makefile" Modified: head/databases/postgresql84-server/Makefile ============================================================================== --- head/databases/postgresql84-server/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-server/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -113,7 +113,6 @@ DEBUG_DESC= Builds with debugging symbol INTDATE_DESC= Builds with 64-bit date/time type (server) SSL_DESC= Build with OpenSSL support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSSL} @@ -231,71 +230,6 @@ CONFIGURE_ARGS+=--with-krb5 .endif # !SLAVE_ONLY -.if defined(CLIENT_ONLY) -MAN1+= clusterdb.1 createdb.1 createlang.1 createuser.1 \ - dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1 \ - pg_config.1 pg_controldata.1 pg_ctl.1 \ - pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \ - postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1 - -MAN7?= alter_foreign_data_wrapper.7 alter_server.7 \ - alter_operator_family.7 \ - alter_text_search_configuration.7 \ - alter_text_search_dictionary.7 \ - alter_text_search_parser.7 \ - alter_text_search_template.7 \ - alter_user_mapping.7 alter_view.7 \ - create_foreign_data_wrapper.7 create_server.7 \ - create_operator_family.7 create_user_mapping.7 \ - create_text_search_configuration.7 \ - create_text_search_dictionary.7 \ - create_text_search_parser.7 \ - create_text_search_template.7 \ - drop_text_search_configuration.7 \ - drop_text_search_dictionary.7 \ - drop_text_search_parser.7 \ - drop_text_search_template.7 \ - discard.7 drop_foreign_data_wrapper.7 drop_server.7 \ - drop_operator_family.7 drop_user_mapping.7 \ - table.7 with.7 -MAN7+= abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \ - alter_domain.7 alter_function.7 alter_group.7 \ - alter_index.7 alter_language.7 alter_operator_class.7 \ - alter_role.7 \ - alter_schema.7 alter_sequence.7 alter_table.7 \ - alter_trigger.7 alter_user.7 analyze.7 begin.7 \ - checkpoint.7 close.7 cluster.7 comment.7 commit.7 \ - commit_prepared.7 \ - copy.7 create_aggregate.7 create_cast.7 \ - create_constraint_trigger.7 create_conversion.7 \ - create_database.7 create_domain.7 create_function.7 \ - create_group.7 create_index.7 create_language.7 \ - create_operator.7 create_operator_class.7 \ - create_role.7 create_rule.7 create_schema.7 create_sequence.7 \ - create_table.7 create_table_as.7 create_trigger.7 \ - create_type.7 create_user.7 create_view.7 deallocate.7 \ - declare.7 delete.7 \ - drop_aggregate.7 drop_cast.7 drop_conversion.7 \ - drop_database.7 drop_domain.7 drop_function.7 \ - drop_group.7 drop_index.7 drop_language.7 \ - drop_operator.7 drop_operator_class.7 \ - drop_owned.7 drop_role.7 drop_rule.7 \ - drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7 \ - drop_type.7 drop_user.7 drop_view.7 end.7 execute.7 \ - explain.7 fetch.7 grant.7 insert.7 listen.7 load.7 \ - lock.7 move.7 notify.7 prepare.7 prepare_transaction.7 \ - reassign_owned.7 reindex.7 reset.7 \ - revoke.7 rollback.7 rollback_prepared.7 select.7 \ - select_into.7 set.7 \ - set_constraints.7 set_role.7 set_transaction.7 show.7 \ - set_session_authorization.7 start_transaction.7 \ - truncate.7 unlisten.7 update.7 vacuum.7 \ - alter_operator.7 alter_tablespace.7 alter_type.7 \ - create_tablespace.7 drop_tablespace.7 \ - release_savepoint.7 rollback_to_savepoint.7 \ - savepoint.7 values.7 -.endif - PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ @@ -340,22 +274,21 @@ post-patch: do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) - @ ${MKDIR} ${PREFIX}/share/postgresql ;\ - ${MKDIR} ${PREFIX}/etc/periodic/daily ;\ + @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ - ${PREFIX}/etc/periodic/daily - ${MKDIR} ${PREFIX}/${PG_USER} && ${CHOWN} ${PG_USER}:${PG_GROUP} ${PREFIX}/${PG_USER} + ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ - ${MKDIR} ${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${COMPONENT} ;\ - ${CAT} ${PKGMESSAGE} ;\ + ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD Modified: head/databases/postgresql84-server/pkg-plist-client ============================================================================== --- head/databases/postgresql84-server/pkg-plist-client Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql84-server/pkg-plist-client Wed Feb 26 17:24:35 2014 (r346217) @@ -548,6 +548,167 @@ lib/postgresql/pgxs/src/nls-global.mk @dirrm lib/postgresql/pgxs/src @dirrm lib/postgresql/pgxs @dirrm lib/postgresql +man/man1/clusterdb.1.gz +man/man1/createdb.1.gz +man/man1/createlang.1.gz +man/man1/createuser.1.gz +man/man1/dropdb.1.gz +man/man1/droplang.1.gz +man/man1/dropuser.1.gz +man/man1/ecpg.1.gz +man/man1/initdb.1.gz +man/man1/pg_config.1.gz +man/man1/pg_controldata.1.gz +man/man1/pg_ctl.1.gz +man/man1/pg_dump.1.gz +man/man1/pg_dumpall.1.gz +man/man1/pg_resetxlog.1.gz +man/man1/pg_restore.1.gz +man/man1/postgres.1.gz +man/man1/postmaster.1.gz +man/man1/psql.1.gz +man/man1/reindexdb.1.gz +man/man1/vacuumdb.1.gz +man/man7/abort.7.gz +man/man7/alter_aggregate.7.gz +man/man7/alter_conversion.7.gz +man/man7/alter_database.7.gz +man/man7/alter_domain.7.gz +man/man7/alter_foreign_data_wrapper.7.gz +man/man7/alter_function.7.gz +man/man7/alter_group.7.gz +man/man7/alter_index.7.gz +man/man7/alter_language.7.gz +man/man7/alter_operator.7.gz +man/man7/alter_operator_class.7.gz +man/man7/alter_operator_family.7.gz +man/man7/alter_role.7.gz +man/man7/alter_schema.7.gz +man/man7/alter_sequence.7.gz +man/man7/alter_server.7.gz +man/man7/alter_table.7.gz +man/man7/alter_tablespace.7.gz +man/man7/alter_text_search_configuration.7.gz +man/man7/alter_text_search_dictionary.7.gz +man/man7/alter_text_search_parser.7.gz +man/man7/alter_text_search_template.7.gz +man/man7/alter_trigger.7.gz +man/man7/alter_type.7.gz +man/man7/alter_user.7.gz +man/man7/alter_user_mapping.7.gz +man/man7/alter_view.7.gz +man/man7/analyze.7.gz +man/man7/begin.7.gz +man/man7/checkpoint.7.gz +man/man7/close.7.gz +man/man7/cluster.7.gz +man/man7/comment.7.gz +man/man7/commit.7.gz +man/man7/commit_prepared.7.gz +man/man7/copy.7.gz +man/man7/create_aggregate.7.gz +man/man7/create_cast.7.gz +man/man7/create_constraint_trigger.7.gz +man/man7/create_conversion.7.gz +man/man7/create_database.7.gz +man/man7/create_domain.7.gz +man/man7/create_foreign_data_wrapper.7.gz +man/man7/create_function.7.gz +man/man7/create_group.7.gz +man/man7/create_index.7.gz +man/man7/create_language.7.gz +man/man7/create_operator.7.gz +man/man7/create_operator_class.7.gz +man/man7/create_operator_family.7.gz +man/man7/create_role.7.gz +man/man7/create_rule.7.gz +man/man7/create_schema.7.gz +man/man7/create_sequence.7.gz +man/man7/create_server.7.gz +man/man7/create_table.7.gz +man/man7/create_table_as.7.gz +man/man7/create_tablespace.7.gz +man/man7/create_text_search_configuration.7.gz +man/man7/create_text_search_dictionary.7.gz +man/man7/create_text_search_parser.7.gz +man/man7/create_text_search_template.7.gz +man/man7/create_trigger.7.gz +man/man7/create_type.7.gz +man/man7/create_user.7.gz +man/man7/create_user_mapping.7.gz +man/man7/create_view.7.gz +man/man7/deallocate.7.gz +man/man7/declare.7.gz +man/man7/delete.7.gz +man/man7/discard.7.gz +man/man7/drop_aggregate.7.gz +man/man7/drop_cast.7.gz +man/man7/drop_conversion.7.gz +man/man7/drop_database.7.gz +man/man7/drop_domain.7.gz +man/man7/drop_foreign_data_wrapper.7.gz +man/man7/drop_function.7.gz +man/man7/drop_group.7.gz +man/man7/drop_index.7.gz +man/man7/drop_language.7.gz +man/man7/drop_operator.7.gz +man/man7/drop_operator_class.7.gz +man/man7/drop_operator_family.7.gz +man/man7/drop_owned.7.gz +man/man7/drop_role.7.gz +man/man7/drop_rule.7.gz +man/man7/drop_schema.7.gz +man/man7/drop_sequence.7.gz +man/man7/drop_server.7.gz +man/man7/drop_table.7.gz +man/man7/drop_tablespace.7.gz +man/man7/drop_text_search_configuration.7.gz +man/man7/drop_text_search_dictionary.7.gz +man/man7/drop_text_search_parser.7.gz +man/man7/drop_text_search_template.7.gz +man/man7/drop_trigger.7.gz +man/man7/drop_type.7.gz +man/man7/drop_user.7.gz +man/man7/drop_user_mapping.7.gz +man/man7/drop_view.7.gz +man/man7/end.7.gz +man/man7/execute.7.gz +man/man7/explain.7.gz +man/man7/fetch.7.gz +man/man7/grant.7.gz +man/man7/insert.7.gz +man/man7/listen.7.gz +man/man7/load.7.gz +man/man7/lock.7.gz +man/man7/move.7.gz +man/man7/notify.7.gz +man/man7/prepare.7.gz +man/man7/prepare_transaction.7.gz +man/man7/reassign_owned.7.gz +man/man7/reindex.7.gz +man/man7/release_savepoint.7.gz +man/man7/reset.7.gz +man/man7/revoke.7.gz +man/man7/rollback.7.gz +man/man7/rollback_prepared.7.gz +man/man7/rollback_to_savepoint.7.gz +man/man7/savepoint.7.gz +man/man7/select.7.gz +man/man7/select_into.7.gz +man/man7/set.7.gz +man/man7/set_constraints.7.gz +man/man7/set_role.7.gz +man/man7/set_session_authorization.7.gz +man/man7/set_transaction.7.gz +man/man7/show.7.gz +man/man7/start_transaction.7.gz +man/man7/table.7.gz +man/man7/truncate.7.gz +man/man7/unlisten.7.gz +man/man7/update.7.gz +man/man7/vacuum.7.gz +man/man7/values.7.gz +man/man7/with.7.gz %%DOCSDIR%%/README-client @dirrmtry %%DOCSDIR%% share/postgresql/pg_service.conf.sample Modified: head/databases/postgresql90-client/Makefile ============================================================================== --- head/databases/postgresql90-client/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-client/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -17,5 +17,4 @@ CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql90-contrib/Makefile ============================================================================== --- head/databases/postgresql90-contrib/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-contrib/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -30,8 +30,7 @@ OPTIONS_DEFINE= OSSP_UUID OSSP_UUID_DESC= Enable / disable ossp-uuid support OPTIONS_DEFAULT= OSSP_UUID -NO_STAGE= yes post-install: - @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README + @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/contrib/README .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql90-docs/Makefile ============================================================================== --- head/databases/postgresql90-docs/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-docs/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -4,5 +4,4 @@ WANT_PGSQL_VER=90 COMPONENT= -docs -NO_STAGE= yes .include "${.CURDIR}/../postgresql91-docs/Makefile" Modified: head/databases/postgresql90-plperl/Makefile ============================================================================== --- head/databases/postgresql90-plperl/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-plperl/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -22,5 +22,4 @@ INSTALL_DIRS= src/pl/plperl SLAVE_ONLY= yes COMPONENT= -plperl -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql90-plpython/Makefile ============================================================================== --- head/databases/postgresql90-plpython/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-plpython/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -27,5 +27,4 @@ BUILD_DIRS= src/backend src/pl/plpython INSTALL_DIRS= src/pl/plpython SLAVE_ONLY= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql90-pltcl/Makefile ============================================================================== --- head/databases/postgresql90-pltcl/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-pltcl/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -3,5 +3,4 @@ WANT_PGSQL_VER?=90 -NO_STAGE= yes .include "${.CURDIR}/../postgresql91-pltcl/Makefile" Modified: head/databases/postgresql90-server/Makefile ============================================================================== --- head/databases/postgresql90-server/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-server/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -15,13 +15,4 @@ BUILD_DIRS?= src/timezone src/backend sr INSTALL_DIRS?= ${BUILD_DIRS} COMPONENT?= -server -.if defined(CLIENT_ONLY) -MAN1= # no MAN1 for 9.0 only - -MAN3= # no MAN3 for 9.0 only - -MAN7= CREATE_CONSTRAINT_TRIGGER.7 -.endif - -NO_STAGE= yes .include "${.CURDIR}/../postgresql91-server/Makefile" Modified: head/databases/postgresql90-server/pkg-plist-client ============================================================================== --- head/databases/postgresql90-server/pkg-plist-client Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql90-server/pkg-plist-client Wed Feb 26 17:24:35 2014 (r346217) @@ -564,6 +564,232 @@ lib/postgresql/pgxs/src/nls-global.mk @dirrm lib/postgresql/pgxs/src @dirrm lib/postgresql/pgxs @dirrm lib/postgresql +man/man1/clusterdb.1.gz +man/man1/createdb.1.gz +man/man1/createlang.1.gz +man/man1/createuser.1.gz +man/man1/dropdb.1.gz +man/man1/droplang.1.gz +man/man1/dropuser.1.gz +man/man1/ecpg.1.gz +man/man1/initdb.1.gz +man/man1/pg_config.1.gz +man/man1/pg_controldata.1.gz +man/man1/pg_ctl.1.gz +man/man1/pg_dump.1.gz +man/man1/pg_dumpall.1.gz +man/man1/pg_resetxlog.1.gz +man/man1/pg_restore.1.gz +man/man1/postgres.1.gz +man/man1/postmaster.1.gz +man/man1/psql.1.gz +man/man1/reindexdb.1.gz +man/man1/vacuumdb.1.gz +man/man3/SPI_connect.3.gz +man/man3/SPI_copytuple.3.gz +man/man3/SPI_cursor_close.3.gz +man/man3/SPI_cursor_fetch.3.gz +man/man3/SPI_cursor_find.3.gz +man/man3/SPI_cursor_move.3.gz +man/man3/SPI_cursor_open.3.gz +man/man3/SPI_cursor_open_with_args.3.gz +man/man3/SPI_cursor_open_with_paramlist.3.gz +man/man3/SPI_exec.3.gz +man/man3/SPI_execp.3.gz +man/man3/SPI_execute.3.gz +man/man3/SPI_execute_plan.3.gz +man/man3/SPI_execute_plan_with_paramlist.3.gz +man/man3/SPI_execute_with_args.3.gz +man/man3/SPI_finish.3.gz +man/man3/SPI_fname.3.gz +man/man3/SPI_fnumber.3.gz +man/man3/SPI_freeplan.3.gz +man/man3/SPI_freetuple.3.gz +man/man3/SPI_freetuptable.3.gz +man/man3/SPI_getargcount.3.gz +man/man3/SPI_getargtypeid.3.gz +man/man3/SPI_getbinval.3.gz +man/man3/SPI_getnspname.3.gz +man/man3/SPI_getrelname.3.gz +man/man3/SPI_gettype.3.gz +man/man3/SPI_gettypeid.3.gz +man/man3/SPI_getvalue.3.gz +man/man3/SPI_is_cursor_plan.3.gz +man/man3/SPI_modifytuple.3.gz +man/man3/SPI_palloc.3.gz +man/man3/SPI_pfree.3.gz +man/man3/SPI_pop.3.gz +man/man3/SPI_prepare.3.gz +man/man3/SPI_prepare_cursor.3.gz +man/man3/SPI_prepare_params.3.gz +man/man3/SPI_push.3.gz +man/man3/SPI_repalloc.3.gz +man/man3/SPI_returntuple.3.gz +man/man3/SPI_saveplan.3.gz +man/man3/SPI_scroll_cursor_fetch.3.gz +man/man3/SPI_scroll_cursor_move.3.gz +man/man3/dblink.3.gz +man/man3/dblink_build_sql_delete.3.gz +man/man3/dblink_build_sql_insert.3.gz +man/man3/dblink_build_sql_update.3.gz +man/man3/dblink_cancel_query.3.gz +man/man3/dblink_close.3.gz +man/man3/dblink_connect.3.gz +man/man3/dblink_connect_u.3.gz +man/man3/dblink_disconnect.3.gz +man/man3/dblink_error_message.3.gz +man/man3/dblink_exec.3.gz +man/man3/dblink_fetch.3.gz +man/man3/dblink_get_connections.3.gz +man/man3/dblink_get_notify.3.gz +man/man3/dblink_get_pkey.3.gz +man/man3/dblink_get_result.3.gz +man/man3/dblink_is_busy.3.gz +man/man3/dblink_open.3.gz +man/man3/dblink_send_query.3.gz +man/man7/ABORT.7.gz +man/man7/ALTER_AGGREGATE.7.gz +man/man7/ALTER_CONVERSION.7.gz +man/man7/ALTER_DATABASE.7.gz +man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz +man/man7/ALTER_DOMAIN.7.gz +man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz +man/man7/ALTER_FUNCTION.7.gz +man/man7/ALTER_GROUP.7.gz +man/man7/ALTER_INDEX.7.gz +man/man7/ALTER_LANGUAGE.7.gz +man/man7/ALTER_LARGE_OBJECT.7.gz +man/man7/ALTER_OPERATOR.7.gz +man/man7/ALTER_OPERATOR_CLASS.7.gz +man/man7/ALTER_OPERATOR_FAMILY.7.gz +man/man7/ALTER_ROLE.7.gz +man/man7/ALTER_SCHEMA.7.gz +man/man7/ALTER_SEQUENCE.7.gz +man/man7/ALTER_SERVER.7.gz +man/man7/ALTER_TABLE.7.gz +man/man7/ALTER_TABLESPACE.7.gz +man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz +man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/ALTER_TRIGGER.7.gz +man/man7/ALTER_TYPE.7.gz +man/man7/ALTER_USER.7.gz +man/man7/ALTER_USER_MAPPING.7.gz +man/man7/ALTER_VIEW.7.gz +man/man7/ANALYZE.7.gz +man/man7/BEGIN.7.gz +man/man7/CHECKPOINT.7.gz +man/man7/CLOSE.7.gz +man/man7/CLUSTER.7.gz +man/man7/COMMENT.7.gz +man/man7/COMMIT.7.gz +man/man7/COMMIT_PREPARED.7.gz +man/man7/COPY.7.gz +man/man7/CREATE_AGGREGATE.7.gz +man/man7/CREATE_CAST.7.gz +man/man7/CREATE_CONSTRAINT_TRIGGER.7.gz +man/man7/CREATE_CONVERSION.7.gz +man/man7/CREATE_DATABASE.7.gz +man/man7/CREATE_DOMAIN.7.gz +man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz +man/man7/CREATE_FUNCTION.7.gz +man/man7/CREATE_GROUP.7.gz +man/man7/CREATE_INDEX.7.gz +man/man7/CREATE_LANGUAGE.7.gz +man/man7/CREATE_OPERATOR.7.gz +man/man7/CREATE_OPERATOR_CLASS.7.gz +man/man7/CREATE_OPERATOR_FAMILY.7.gz +man/man7/CREATE_ROLE.7.gz +man/man7/CREATE_RULE.7.gz +man/man7/CREATE_SCHEMA.7.gz +man/man7/CREATE_SEQUENCE.7.gz +man/man7/CREATE_SERVER.7.gz +man/man7/CREATE_TABLE.7.gz +man/man7/CREATE_TABLESPACE.7.gz +man/man7/CREATE_TABLE_AS.7.gz +man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz +man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/CREATE_TRIGGER.7.gz +man/man7/CREATE_TYPE.7.gz +man/man7/CREATE_USER.7.gz +man/man7/CREATE_USER_MAPPING.7.gz +man/man7/CREATE_VIEW.7.gz +man/man7/DEALLOCATE.7.gz +man/man7/DECLARE.7.gz +man/man7/DELETE.7.gz +man/man7/DISCARD.7.gz +man/man7/DO.7.gz +man/man7/DROP_AGGREGATE.7.gz +man/man7/DROP_CAST.7.gz +man/man7/DROP_CONVERSION.7.gz +man/man7/DROP_DATABASE.7.gz +man/man7/DROP_DOMAIN.7.gz +man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz +man/man7/DROP_FUNCTION.7.gz +man/man7/DROP_GROUP.7.gz +man/man7/DROP_INDEX.7.gz +man/man7/DROP_LANGUAGE.7.gz +man/man7/DROP_OPERATOR.7.gz +man/man7/DROP_OPERATOR_CLASS.7.gz +man/man7/DROP_OPERATOR_FAMILY.7.gz +man/man7/DROP_OWNED.7.gz +man/man7/DROP_ROLE.7.gz +man/man7/DROP_RULE.7.gz +man/man7/DROP_SCHEMA.7.gz +man/man7/DROP_SEQUENCE.7.gz +man/man7/DROP_SERVER.7.gz +man/man7/DROP_TABLE.7.gz +man/man7/DROP_TABLESPACE.7.gz +man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/DROP_TEXT_SEARCH_PARSER.7.gz +man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/DROP_TRIGGER.7.gz +man/man7/DROP_TYPE.7.gz +man/man7/DROP_USER.7.gz +man/man7/DROP_USER_MAPPING.7.gz +man/man7/DROP_VIEW.7.gz +man/man7/END.7.gz +man/man7/EXECUTE.7.gz +man/man7/EXPLAIN.7.gz +man/man7/FETCH.7.gz +man/man7/GRANT.7.gz +man/man7/INSERT.7.gz +man/man7/LISTEN.7.gz +man/man7/LOAD.7.gz +man/man7/LOCK.7.gz +man/man7/MOVE.7.gz +man/man7/NOTIFY.7.gz +man/man7/PREPARE.7.gz +man/man7/PREPARE_TRANSACTION.7.gz +man/man7/REASSIGN_OWNED.7.gz +man/man7/REINDEX.7.gz +man/man7/RELEASE_SAVEPOINT.7.gz +man/man7/RESET.7.gz +man/man7/REVOKE.7.gz +man/man7/ROLLBACK.7.gz +man/man7/ROLLBACK_PREPARED.7.gz +man/man7/ROLLBACK_TO_SAVEPOINT.7.gz +man/man7/SAVEPOINT.7.gz +man/man7/SELECT.7.gz +man/man7/SELECT_INTO.7.gz +man/man7/SET.7.gz +man/man7/SET_CONSTRAINTS.7.gz +man/man7/SET_ROLE.7.gz +man/man7/SET_SESSION_AUTHORIZATION.7.gz +man/man7/SET_TRANSACTION.7.gz +man/man7/SHOW.7.gz +man/man7/START_TRANSACTION.7.gz +man/man7/TABLE.7.gz +man/man7/TRUNCATE.7.gz +man/man7/UNLISTEN.7.gz +man/man7/UPDATE.7.gz +man/man7/VACUUM.7.gz +man/man7/VALUES.7.gz +man/man7/WITH.7.gz %%DOCSDIR%%/README-client @dirrmtry %%DOCSDIR%% share/postgresql/pg_service.conf.sample Modified: head/databases/postgresql91-client/Makefile ============================================================================== --- head/databases/postgresql91-client/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-client/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -17,5 +17,4 @@ CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql91-contrib/Makefile ============================================================================== --- head/databases/postgresql91-contrib/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-contrib/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -29,8 +29,7 @@ OPTIONS_DEFINE= OSSP_UUID OSSP_UUID_DESC= Enable / disable ossp-uuid support OPTIONS_DEFAULT= OSSP_UUID -NO_STAGE= yes post-install: - @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/extension/README + @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql91-docs/Makefile ============================================================================== --- head/databases/postgresql91-docs/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-docs/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -29,18 +29,17 @@ BUILD_DEPENDS+= onsgmls:${PORTSDIR}/text ${dbdir}/dsssl/modular/catalog:${PORTSDIR}/textproc/dsssl-docbook-modular \ ${dbdir}/4.2:${PORTSDIR}/textproc/docbook-sgml -NO_STAGE= yes do-build: ${GMAKE} -C ${WRKSRC} html do-install: - @ $(MKDIR) ${PGDOCSDIR} + @ $(MKDIR) ${STAGEDIR}${PGDOCSDIR} ( cd ${WRKSRC}/doc/src/sgml/html && \ - ${COPYTREE_SHARE} \* ${PGDOCSDIR} ) + ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) post-install: - @(cd ${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} - @(cd ${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \ + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \ ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST} Modified: head/databases/postgresql91-plperl/Makefile ============================================================================== --- head/databases/postgresql91-plperl/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-plperl/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -4,5 +4,4 @@ WANT_PGSQL_VER= 91 COMPONENT= -plperl -NO_STAGE= yes .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql91-pltcl/Makefile ============================================================================== --- head/databases/postgresql91-pltcl/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-pltcl/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -30,5 +30,4 @@ INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql91-server/Makefile ============================================================================== --- head/databases/postgresql91-server/Makefile Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-server/Makefile Wed Feb 26 17:24:35 2014 (r346217) @@ -109,7 +109,6 @@ SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT= NLS XML TZDATA INTDATE SSL .endif # !SLAVE_ONLY -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSSL} @@ -226,95 +225,6 @@ CONFIGURE_ARGS+=--with-krb5 .endif # !SLAVE_ONLY -.if defined(CLIENT_ONLY) -MAN1?= pg_basebackup.1 -MAN1+= clusterdb.1 createdb.1 createlang.1 createuser.1 \ - dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1 \ - pg_config.1 pg_controldata.1 pg_ctl.1 \ - pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \ - postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1 - -MAN3+= SPI_connect.3 SPI_copytuple.3 SPI_cursor_close.3 SPI_cursor_fetch.3 \ - SPI_cursor_find.3 SPI_cursor_move.3 SPI_cursor_open.3 \ - SPI_cursor_open_with_args.3 SPI_cursor_open_with_paramlist.3 \ - SPI_exec.3 SPI_execp.3 SPI_execute.3 SPI_execute_plan.3 \ - SPI_execute_plan_with_paramlist.3 SPI_execute_with_args.3 \ - SPI_finish.3 SPI_fname.3 SPI_fnumber.3 SPI_freeplan.3 \ - SPI_freetuple.3 SPI_freetuptable.3 SPI_getargcount.3 \ - SPI_getargtypeid.3 SPI_getbinval.3 SPI_getnspname.3 \ - SPI_getrelname.3 SPI_gettype.3 SPI_gettypeid.3 \ - SPI_getvalue.3 SPI_is_cursor_plan.3 SPI_modifytuple.3 \ - SPI_palloc.3 SPI_pfree.3 SPI_pop.3 SPI_prepare.3 \ - SPI_prepare_cursor.3 SPI_prepare_params.3 SPI_push.3 \ - SPI_repalloc.3 SPI_returntuple.3 SPI_saveplan.3 \ - SPI_scroll_cursor_fetch.3 SPI_scroll_cursor_move.3 \ - dblink.3 dblink_build_sql_delete.3 dblink_build_sql_insert.3 \ - dblink_build_sql_update.3 dblink_cancel_query.3 \ - dblink_close.3 dblink_connect.3 dblink_connect_u.3 \ - dblink_disconnect.3 dblink_error_message.3 dblink_exec.3 \ - dblink_fetch.3 dblink_get_connections.3 dblink_get_notify.3 \ - dblink_get_pkey.3 dblink_get_result.3 dblink_is_busy.3 \ - dblink_open.3 dblink_send_query.3 - -MAN7?= ALTER_COLLATION.7 ALTER_EXTENSION.7 ALTER_FOREIGN_TABLE.7 \ - CREATE_COLLATION.7 CREATE_EXTENSION.7 CREATE_FOREIGN_TABLE.7 \ - DROP_COLLATION.7 DROP_EXTENSION.7 DROP_FOREIGN_TABLE.7 \ - SECURITY_LABEL.7 -MAN7+= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 \ - ALTER_DATABASE.7 ALTER_DEFAULT_PRIVILEGES.7 \ - ALTER_DOMAIN.7 ALTER_FOREIGN_DATA_WRAPPER.7 ALTER_FUNCTION.7 \ - ALTER_GROUP.7 ALTER_LARGE_OBJECT.7 ALTER_SERVER.7 \ - ALTER_USER_MAPPING.7 ALTER_INDEX.7 ALTER_LANGUAGE.7 \ - ALTER_OPERATOR_CLASS.7 ALTER_OPERATOR_FAMILY.7 \ - ALTER_ROLE.7 \ - ALTER_SCHEMA.7 ALTER_SEQUENCE.7 ALTER_TABLE.7 \ - ALTER_TEXT_SEARCH_CONFIGURATION.7 \ - ALTER_TEXT_SEARCH_DICTIONARY.7 \ - ALTER_TEXT_SEARCH_PARSER.7 \ - ALTER_TEXT_SEARCH_TEMPLATE.7 \ - ALTER_TRIGGER.7 ALTER_USER.7 ALTER_VIEW.7 ANALYZE.7 BEGIN.7 \ - CHECKPOINT.7 CLOSE.7 CLUSTER.7 COMMENT.7 COMMIT.7 \ - COMMIT_PREPARED.7 \ - COPY.7 CREATE_AGGREGATE.7 CREATE_CAST.7 \ - CREATE_CONVERSION.7 \ - CREATE_DATABASE.7 CREATE_DOMAIN.7 \ - CREATE_FOREIGN_DATA_WRAPPER.7 CREATE_FUNCTION.7 \ - CREATE_GROUP.7 CREATE_INDEX.7 CREATE_LANGUAGE.7 \ - CREATE_OPERATOR.7 CREATE_OPERATOR_CLASS.7 \ - CREATE_OPERATOR_FAMILY.7 CREATE_ROLE.7 \ - CREATE_RULE.7 CREATE_SCHEMA.7 CREATE_SEQUENCE.7 \ - CREATE_SERVER.7 CREATE_TABLE.7 CREATE_TABLE_AS.7 \ - CREATE_TEXT_SEARCH_CONFIGURATION.7 \ - CREATE_TEXT_SEARCH_DICTIONARY.7 \ - CREATE_TEXT_SEARCH_PARSER.7 \ - CREATE_TEXT_SEARCH_TEMPLATE.7 CREATE_TRIGGER.7 \ - CREATE_TYPE.7 CREATE_USER.7 CREATE_USER_MAPPING.7 \ - CREATE_VIEW.7 DEALLOCATE.7 DECLARE.7 DELETE.7 DISCARD.7 \ - DO.7 DROP_AGGREGATE.7 DROP_CAST.7 DROP_CONVERSION.7 \ - DROP_DATABASE.7 DROP_DOMAIN.7 DROP_FOREIGN_DATA_WRAPPER.7 \ - DROP_FUNCTION.7 DROP_GROUP.7 DROP_INDEX.7 DROP_LANGUAGE.7 \ - DROP_OPERATOR.7 DROP_OPERATOR_CLASS.7 DROP_OPERATOR_FAMILY.7 \ - DROP_OWNED.7 DROP_ROLE.7 DROP_RULE.7 \ - DROP_SCHEMA.7 DROP_SEQUENCE.7 DROP_SERVER.7 DROP_TABLE.7 \ - DROP_TEXT_SEARCH_CONFIGURATION.7 \ - DROP_TEXT_SEARCH_DICTIONARY.7 \ - DROP_TEXT_SEARCH_PARSER.7 \ - DROP_TEXT_SEARCH_TEMPLATE.7 DROP_TRIGGER.7 \ - DROP_TYPE.7 DROP_USER.7 DROP_USER_MAPPING.7 DROP_VIEW.7 END.7 \ - EXECUTE.7 EXPLAIN.7 FETCH.7 GRANT.7 INSERT.7 LISTEN.7 LOAD.7 \ - LOCK.7 MOVE.7 NOTIFY.7 PREPARE.7 PREPARE_TRANSACTION.7 \ - REASSIGN_OWNED.7 REINDEX.7 RESET.7 \ - REVOKE.7 ROLLBACK.7 ROLLBACK_PREPARED.7 SELECT.7 \ - SELECT_INTO.7 SET.7 \ - SET_CONSTRAINTS.7 SET_ROLE.7 SET_TRANSACTION.7 SHOW.7 \ - SET_SESSION_AUTHORIZATION.7 START_TRANSACTION.7 \ - TABLE.7 TRUNCATE.7 UNLISTEN.7 UPDATE.7 VACUUM.7 \ - ALTER_OPERATOR.7 ALTER_TABLESPACE.7 ALTER_TYPE.7 \ - CREATE_TABLESPACE.7 DROP_TABLESPACE.7 \ - RELEASE_SAVEPOINT.7 ROLLBACK_TO_SAVEPOINT.7 \ - SAVEPOINT.7 VALUES.7 WITH.7 -.endif - PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ @@ -356,22 +266,21 @@ post-patch: do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) - @ ${MKDIR} ${PREFIX}/share/postgresql ;\ - ${MKDIR} ${PREFIX}/etc/periodic/daily ;\ + @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ - ${PREFIX}/etc/periodic/daily - ${MKDIR} ${PREFIX}/${PG_USER} && ${CHOWN} ${PG_USER}:${PG_GROUP} ${PREFIX}/${PG_USER} + ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ - ${MKDIR} ${DOCSDIR} ;\ - ${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${COMPONENT} ;\ - ${CAT} ${PKGMESSAGE} ;\ + ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ + ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD Modified: head/databases/postgresql91-server/pkg-plist-client ============================================================================== --- head/databases/postgresql91-server/pkg-plist-client Wed Feb 26 17:15:02 2014 (r346216) +++ head/databases/postgresql91-server/pkg-plist-client Wed Feb 26 17:24:35 2014 (r346217) @@ -586,6 +586,242 @@ lib/postgresql/pgxs/src/nls-global.mk @dirrm lib/postgresql/pgxs/src @dirrm lib/postgresql/pgxs @dirrm lib/postgresql +man/man1/clusterdb.1.gz +man/man1/createdb.1.gz +man/man1/createlang.1.gz +man/man1/createuser.1.gz +man/man1/dropdb.1.gz +man/man1/droplang.1.gz +man/man1/dropuser.1.gz +man/man1/ecpg.1.gz +man/man1/initdb.1.gz +man/man1/pg_basebackup.1.gz +man/man1/pg_config.1.gz +man/man1/pg_controldata.1.gz +man/man1/pg_ctl.1.gz +man/man1/pg_dump.1.gz +man/man1/pg_dumpall.1.gz +man/man1/pg_resetxlog.1.gz +man/man1/pg_restore.1.gz +man/man1/postgres.1.gz +man/man1/postmaster.1.gz +man/man1/psql.1.gz +man/man1/reindexdb.1.gz +man/man1/vacuumdb.1.gz +man/man3/SPI_connect.3.gz +man/man3/SPI_copytuple.3.gz +man/man3/SPI_cursor_close.3.gz +man/man3/SPI_cursor_fetch.3.gz +man/man3/SPI_cursor_find.3.gz +man/man3/SPI_cursor_move.3.gz +man/man3/SPI_cursor_open.3.gz +man/man3/SPI_cursor_open_with_args.3.gz +man/man3/SPI_cursor_open_with_paramlist.3.gz +man/man3/SPI_exec.3.gz +man/man3/SPI_execp.3.gz +man/man3/SPI_execute.3.gz +man/man3/SPI_execute_plan.3.gz +man/man3/SPI_execute_plan_with_paramlist.3.gz +man/man3/SPI_execute_with_args.3.gz +man/man3/SPI_finish.3.gz +man/man3/SPI_fname.3.gz +man/man3/SPI_fnumber.3.gz +man/man3/SPI_freeplan.3.gz +man/man3/SPI_freetuple.3.gz +man/man3/SPI_freetuptable.3.gz +man/man3/SPI_getargcount.3.gz +man/man3/SPI_getargtypeid.3.gz +man/man3/SPI_getbinval.3.gz +man/man3/SPI_getnspname.3.gz +man/man3/SPI_getrelname.3.gz +man/man3/SPI_gettype.3.gz +man/man3/SPI_gettypeid.3.gz +man/man3/SPI_getvalue.3.gz +man/man3/SPI_is_cursor_plan.3.gz +man/man3/SPI_modifytuple.3.gz +man/man3/SPI_palloc.3.gz +man/man3/SPI_pfree.3.gz +man/man3/SPI_pop.3.gz +man/man3/SPI_prepare.3.gz +man/man3/SPI_prepare_cursor.3.gz +man/man3/SPI_prepare_params.3.gz +man/man3/SPI_push.3.gz +man/man3/SPI_repalloc.3.gz +man/man3/SPI_returntuple.3.gz +man/man3/SPI_saveplan.3.gz +man/man3/SPI_scroll_cursor_fetch.3.gz +man/man3/SPI_scroll_cursor_move.3.gz +man/man3/dblink.3.gz +man/man3/dblink_build_sql_delete.3.gz +man/man3/dblink_build_sql_insert.3.gz +man/man3/dblink_build_sql_update.3.gz +man/man3/dblink_cancel_query.3.gz +man/man3/dblink_close.3.gz +man/man3/dblink_connect.3.gz +man/man3/dblink_connect_u.3.gz +man/man3/dblink_disconnect.3.gz +man/man3/dblink_error_message.3.gz +man/man3/dblink_exec.3.gz +man/man3/dblink_fetch.3.gz +man/man3/dblink_get_connections.3.gz +man/man3/dblink_get_notify.3.gz +man/man3/dblink_get_pkey.3.gz +man/man3/dblink_get_result.3.gz +man/man3/dblink_is_busy.3.gz +man/man3/dblink_open.3.gz +man/man3/dblink_send_query.3.gz +man/man7/ABORT.7.gz +man/man7/ALTER_AGGREGATE.7.gz +man/man7/ALTER_COLLATION.7.gz +man/man7/ALTER_CONVERSION.7.gz +man/man7/ALTER_DATABASE.7.gz +man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz +man/man7/ALTER_DOMAIN.7.gz +man/man7/ALTER_EXTENSION.7.gz +man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz +man/man7/ALTER_FOREIGN_TABLE.7.gz +man/man7/ALTER_FUNCTION.7.gz +man/man7/ALTER_GROUP.7.gz +man/man7/ALTER_INDEX.7.gz +man/man7/ALTER_LANGUAGE.7.gz +man/man7/ALTER_LARGE_OBJECT.7.gz +man/man7/ALTER_OPERATOR.7.gz +man/man7/ALTER_OPERATOR_CLASS.7.gz +man/man7/ALTER_OPERATOR_FAMILY.7.gz +man/man7/ALTER_ROLE.7.gz +man/man7/ALTER_SCHEMA.7.gz +man/man7/ALTER_SEQUENCE.7.gz +man/man7/ALTER_SERVER.7.gz +man/man7/ALTER_TABLE.7.gz +man/man7/ALTER_TABLESPACE.7.gz +man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz +man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz +man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz +man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz +man/man7/ALTER_TRIGGER.7.gz +man/man7/ALTER_TYPE.7.gz +man/man7/ALTER_USER.7.gz +man/man7/ALTER_USER_MAPPING.7.gz +man/man7/ALTER_VIEW.7.gz +man/man7/ANALYZE.7.gz +man/man7/BEGIN.7.gz +man/man7/CHECKPOINT.7.gz +man/man7/CLOSE.7.gz +man/man7/CLUSTER.7.gz +man/man7/COMMENT.7.gz +man/man7/COMMIT.7.gz +man/man7/COMMIT_PREPARED.7.gz +man/man7/COPY.7.gz +man/man7/CREATE_AGGREGATE.7.gz +man/man7/CREATE_CAST.7.gz +man/man7/CREATE_COLLATION.7.gz +man/man7/CREATE_CONVERSION.7.gz +man/man7/CREATE_DATABASE.7.gz +man/man7/CREATE_DOMAIN.7.gz +man/man7/CREATE_EXTENSION.7.gz +man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz +man/man7/CREATE_FOREIGN_TABLE.7.gz +man/man7/CREATE_FUNCTION.7.gz +man/man7/CREATE_GROUP.7.gz +man/man7/CREATE_INDEX.7.gz +man/man7/CREATE_LANGUAGE.7.gz +man/man7/CREATE_OPERATOR.7.gz +man/man7/CREATE_OPERATOR_CLASS.7.gz +man/man7/CREATE_OPERATOR_FAMILY.7.gz +man/man7/CREATE_ROLE.7.gz +man/man7/CREATE_RULE.7.gz +man/man7/CREATE_SCHEMA.7.gz +man/man7/CREATE_SEQUENCE.7.gz +man/man7/CREATE_SERVER.7.gz +man/man7/CREATE_TABLE.7.gz +man/man7/CREATE_TABLESPACE.7.gz +man/man7/CREATE_TABLE_AS.7.gz *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***