Date: Sat, 17 Aug 2019 19:43:08 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509164 - head/databases/pg_partman Message-ID: <201908171943.x7HJh8Mq042857@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sat Aug 17 19:43:08 2019 New Revision: 509164 URL: https://svnweb.freebsd.org/changeset/ports/509164 Log: databases/pg_partman: Unbreak build with PostgreSQL 11+ =======================<phase: package >============================ ===> Building package for pg_partman-4.0.0_1 pkg-static: Unable to access file /wrkdirs/usr/ports/databases/pg_partman/work/stage/usr/local/bin/partition_data.py:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/databases/pg_partman/work/stage/usr/local/bin/reapply_constraints.py:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/databases/pg_partman/work/stage/usr/local/bin/reapply_foreign_keys.py:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/databases/pg_partman/work/stage/usr/local/bin/undo_partition.py:No such file or directory *** Error code 1 http://package18.nyi.freebsd.org/data/120amd64-default-PR239514/2019-07-29_20h41m52s/logs/pg_partman-4.0.0_1.log With PostgreSQL 11+ some scripts are only installed when they are common to all PG versions per the Makefile. Exclude them from the plist in case we are building with PG11+. PR: 239609 Approved by: lacey.leanne@gmail.com (maintainer timeout, 2 weeks) Modified: head/databases/pg_partman/Makefile head/databases/pg_partman/pkg-plist Modified: head/databases/pg_partman/Makefile ============================================================================== --- head/databases/pg_partman/Makefile Sat Aug 17 19:24:47 2019 (r509163) +++ head/databases/pg_partman/Makefile Sat Aug 17 19:43:08 2019 (r509164) @@ -25,6 +25,16 @@ SHEBANG_GLOB= *.py OPTIONS_DEFINE= DOCS +.include <bsd.port.pre.mk> + +# With PG11+ some scripts are only installed when they are common to +# all PG versions. +.if ${PGSQL_VER:R} < 11 +PLIST_SUB+= OLDPG="" +.else +PLIST_SUB+= OLDPG="@comment " +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pg_partman_bgw.so @@ -37,4 +47,4 @@ post-install-DOCS-on: post-install-DOCS-off: ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/postgresql -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/databases/pg_partman/pkg-plist ============================================================================== --- head/databases/pg_partman/pkg-plist Sat Aug 17 19:24:47 2019 (r509163) +++ head/databases/pg_partman/pkg-plist Sat Aug 17 19:43:08 2019 (r509164) @@ -1,10 +1,10 @@ bin/check_unique_constraint.py bin/dump_partition.py -bin/partition_data.py -bin/reapply_constraints.py -bin/reapply_foreign_keys.py +%%OLDPG%%bin/partition_data.py +%%OLDPG%%bin/reapply_constraints.py +%%OLDPG%%bin/reapply_foreign_keys.py bin/reapply_indexes.py -bin/undo_partition.py +%%OLDPG%%bin/undo_partition.py bin/vacuum_maintenance.py lib/postgresql/pg_partman_bgw.so %%PORTDOCS%%%%DOCSDIR%%/migration_to_partman.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908171943.x7HJh8Mq042857>