Date: Mon, 15 Jun 2020 06:56:41 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> 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 Message-ID: <202006150656.05F6ufOi012969@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006150656.05F6ufOi012969>