From owner-svn-ports-head@freebsd.org Sat Aug 17 19:43:09 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D80FCF704; Sat, 17 Aug 2019 19:43:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 469rFn0rQnz3C0F; Sat, 17 Aug 2019 19:43:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D7FE81EA02; Sat, 17 Aug 2019 19:43:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7HJh8SQ042858; Sat, 17 Aug 2019 19:43:08 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7HJh8Mq042857; Sat, 17 Aug 2019 19:43:08 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201908171943.x7HJh8Mq042857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 17 Aug 2019 19:43:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509164 - head/databases/pg_partman X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/databases/pg_partman X-SVN-Commit-Revision: 509164 X-SVN-Commit-Repository: ports 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.29 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: Sat, 17 Aug 2019 19:43:09 -0000 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+ =================================================== ===> 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 + +# 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 +.include 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