postgresql-jdbc compiles but will not install (when using pkgng) because of conflicts with other postgresql ports on the following files: /usr/local/share/doc/postgresql/README-client /usr/local/share/doc/postgresql/README-contrib /usr/local/share/doc/postgresql/README-pltcl /usr/local/share/doc/postgresql/README-server /usr/local/share/doc/postgresql/extension/README /usr/local/share/doc/postgresql/extension/autoinc.example /usr/local/share/doc/postgresql/extension/insert_username.example /usr/local/share/doc/postgresql/extension/moddatetime.example /usr/local/share/doc/postgresql/extension/refint.example /usr/local/share/doc/postgresql/extension/timetravel.example Fix: Remove these documents from the postgresql-jdbc port and leave them with the other postgresql ports where they belong How-To-Repeat: portupgrade -fp databases/postgresql-jdbc
Responsible Changed From-To: freebsd-ports-bugs->pgsql Over to maintainer.
Author: jgh Date: Sun Feb 17 16:25:53 2013 New Revision: 312425 URL: http://svnweb.freebsd.org/changeset/ports/312425 Log: - fix documentation conflict [1] - remove examples notation from pkg-message (no longer distributed/installed) [1] PR: 176066 Submitted by: walterhurry@gmail.com, jgh@ [1] With hat: pgsql@ Modified: head/databases/postgresql-jdbc/Makefile head/databases/postgresql-jdbc/files/pkg-message.in Modified: head/databases/postgresql-jdbc/Makefile ============================================================================== --- head/databases/postgresql-jdbc/Makefile Sun Feb 17 16:15:58 2013 (r312424) +++ head/databases/postgresql-jdbc/Makefile Sun Feb 17 16:25:53 2013 (r312425) @@ -7,6 +7,7 @@ PORTNAME= postgresql PORTVERSION= 9.1.902 +PORTREVISION= 1 DISTVERSIONSUFFIX=.src CATEGORIES= databases java MASTER_SITES= http://jdbc.postgresql.org/download/ @@ -23,20 +24,20 @@ USE_JAVA= yes PLIST_FILES= %%JAVAJARDIR%%/postgresql.jar PORTDOCS= * +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message post-patch: ${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README +.include <bsd.port.options.mk> + do-install: @ ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${JAVAJARDIR}/postgresql.jar -.if !defined(NOPORTDOCS) - @ ${MKDIR} -m 0755 ${DOCSDIR} ;\ - ${INSTALL_DATA} ${WRKSRC}/README \ - ${DOCSDIR}/README-jdbc +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif - -post-install: @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/databases/postgresql-jdbc/files/pkg-message.in ============================================================================== --- head/databases/postgresql-jdbc/files/pkg-message.in Sun Feb 17 16:15:58 2013 (r312424) +++ head/databases/postgresql-jdbc/files/pkg-message.in Sun Feb 17 16:25:53 2013 (r312425) @@ -3,6 +3,3 @@ PostgreSQL JDBC support installed! postgresql.jar resides in %%JAVAJARDIR%%/postgresql.jar Add this to your CLASSPATH! - -java examples reside in -%%EXAMPLESDIR%%/jdbc _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!