From owner-svn-ports-head@freebsd.org Mon Jun 15 06:56:42 2020 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 1ED7F32A308; Mon, 15 Jun 2020 06:56:42 +0000 (UTC) (envelope-from girgen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49lhvY71GSz4C4Y; Mon, 15 Jun 2020 06:56:41 +0000 (UTC) (envelope-from girgen@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 EBE8D19A9D; Mon, 15 Jun 2020 06:56:41 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05F6ufic012973; Mon, 15 Jun 2020 06:56:41 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05F6ufOi012969; Mon, 15 Jun 2020 06:56:41 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <202006150656.05F6ufOi012969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Mon, 15 Jun 2020 06:56:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538854 - in head/databases: postgresql-jdbc postgresql11-server postgresql12-server X-SVN-Group: ports-head X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in head/databases: postgresql-jdbc postgresql11-server postgresql12-server X-SVN-Commit-Revision: 538854 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.33 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: Mon, 15 Jun 2020 06:56:42 -0000 Author: girgen Date: Mon Jun 15 06:56:40 2020 New Revision: 538854 URL: https://svnweb.freebsd.org/changeset/ports/538854 Log: Fix bad plist substitution PR: 247226 Reported by: Garrett Wollman Modified: head/databases/postgresql-jdbc/Makefile head/databases/postgresql-jdbc/distinfo head/databases/postgresql11-server/pkg-plist-server head/databases/postgresql12-server/pkg-plist-server Modified: head/databases/postgresql-jdbc/Makefile ============================================================================== --- head/databases/postgresql-jdbc/Makefile Mon Jun 15 06:49:59 2020 (r538853) +++ head/databases/postgresql-jdbc/Makefile Mon Jun 15 06:56:40 2020 (r538854) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= postgresql -PORTVERSION= 9.2.1004 +PORTVERSION= 42.2.12 DISTVERSIONSUFFIX=.src CATEGORIES= databases java MASTER_SITES= http://jdbc.postgresql.org/download/ PKGNAMESUFFIX= -jdbc -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION:C/.([0-9][0-9][0-9]*)/-\1/g}${DISTVERSIONSUFFIX} +DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= pgsql@FreeBSD.org COMMENT= The Java JDBC implementation for PostgreSQL @@ -15,7 +15,7 @@ COMMENT= The Java JDBC implementation for PostgreSQL LICENSE= BSD3CLAUSE DIST_SUBDIR= postgresql - +WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION:C/.([0-9][0-9][0-9]*)/-\1/g}${DISTVERSIONSUFFIX} USE_ANT= yes USE_JAVA= yes NO_ARCH= yes @@ -28,14 +28,11 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes -post-patch: - ${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README - do-install: ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${STAGEDIR}${JAVAJARDIR}/postgresql.jar do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Modified: head/databases/postgresql-jdbc/distinfo ============================================================================== --- head/databases/postgresql-jdbc/distinfo Mon Jun 15 06:49:59 2020 (r538853) +++ head/databases/postgresql-jdbc/distinfo Mon Jun 15 06:56:40 2020 (r538854) @@ -1,2 +1,3 @@ -SHA256 (postgresql/postgresql-jdbc-9.2-1004.src.tar.gz) = eeadff0d830cd19a4f52a9489748a7126b0c1d4863bf9a5d65618158dfc6ae68 -SIZE (postgresql/postgresql-jdbc-9.2-1004.src.tar.gz) = 1842921 +TIMESTAMP = 1589616576 +SHA256 (postgresql/postgresql-jdbc-42.2.12.src.tar.gz) = 11095b4628befa96a640b77329591bb1380004b57ec6bf648928542448765ac8 +SIZE (postgresql/postgresql-jdbc-42.2.12.src.tar.gz) = 1471368 Modified: head/databases/postgresql11-server/pkg-plist-server ============================================================================== --- head/databases/postgresql11-server/pkg-plist-server Mon Jun 15 06:49:59 2020 (r538853) +++ head/databases/postgresql11-server/pkg-plist-server Mon Jun 15 06:56:40 2020 (r538854) @@ -524,7 +524,7 @@ lib/postgresql/utf8_and_win.so %%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgrtype.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/dest.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/fastpath.bc -%%LLVM%%lib/postgresql/bitcode/postgres/tcop/%%PG_USER%%.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/postgres.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/pquery.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/utility.bc %%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict.bc Modified: head/databases/postgresql12-server/pkg-plist-server ============================================================================== --- head/databases/postgresql12-server/pkg-plist-server Mon Jun 15 06:49:59 2020 (r538853) +++ head/databases/postgresql12-server/pkg-plist-server Mon Jun 15 06:56:40 2020 (r538854) @@ -537,7 +537,7 @@ lib/postgresql/utf8_and_win.so %%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/md.bc %%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgr.bc %%LLVM%%lib/postgresql/bitcode/postgres/storage/sync/sync.bc -%%LLVM%%lib/postgresql/bitcode/postgres/tcop/%%PG_USER%%.bc +%%LLVM%%lib/postgresql/bitcode/postgres/tcop/postgres.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/dest.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/fastpath.bc %%LLVM%%lib/postgresql/bitcode/postgres/tcop/pquery.bc