Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Feb 2013 16:25:53 +0000 (UTC)
From:      Jason Helfman <jgh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r312425 - in head/databases/postgresql-jdbc: . files
Message-ID:  <201302171625.r1HGPriS089786@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302171625.r1HGPriS089786>