From owner-svn-ports-head@FreeBSD.ORG  Sun Feb 17 16:25:54 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4ED05987;
 Sun, 17 Feb 2013 16:25:54 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 28B8AE10;
 Sun, 17 Feb 2013 16:25:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1HGPsRs089791;
 Sun, 17 Feb 2013 16:25:54 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1HGPriS089786;
 Sun, 17 Feb 2013 16:25:53 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201302171625.r1HGPriS089786@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sun, 17 Feb 2013 16:25:53 +0000 (UTC)
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
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Feb 2013 16:25:54 -0000

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