svn commit: r357105 - in head/databases/postgresql-jdbc: . files

[Palle Girgensohn]

Author: girgen
Date: Mon Jun  9 06:24:45 2014
New Revision: 357105
URL: http://svnweb.freebsd.org/changeset/ports/357105
QAT: https://qat.redports.org/buildarchive/r357105/

Log:
  - Update to 9.2.1004
  - Stage support
  - Add LICENSE
  
  Submitted by:	bar@

Modified:
  head/databases/postgresql-jdbc/Makefile
  head/databases/postgresql-jdbc/distinfo
  head/databases/postgresql-jdbc/files/patch-build-xml

Modified: head/databases/postgresql-jdbc/Makefile
==============================================================================
--- head/databases/postgresql-jdbc/Makefile	Mon Jun  9 05:07:54 2014	(r357104)
+++ head/databases/postgresql-jdbc/Makefile	Mon Jun  9 06:24:45 2014	(r357105)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTVERSION=	9.1.902
-PORTREVISION=	1
+PORTVERSION=	9.2.1004
 DISTVERSIONSUFFIX=.src
 CATEGORIES=	databases java
 MASTER_SITES=	http://jdbc.postgresql.org/download/
@@ -13,6 +12,8 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${
 MAINTAINER=	pgsql at FreeBSD.org
 COMMENT=	The Java JDBC implementation for PostgreSQL
 
+LICENSE=	BSD3CLAUSE
+
 DIST_SUBDIR=	postgresql
 
 USE_ANT=	yes
@@ -23,7 +24,6 @@ PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README
 
@@ -31,11 +31,13 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+OPTIONS_SUB=	yes
+
 do-install:
-	@ ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${JAVAJARDIR}/postgresql.jar
+	@ ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${STAGEDIR}${JAVAJARDIR}/postgresql.jar
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/databases/postgresql-jdbc/distinfo
==============================================================================
--- head/databases/postgresql-jdbc/distinfo	Mon Jun  9 05:07:54 2014	(r357104)
+++ head/databases/postgresql-jdbc/distinfo	Mon Jun  9 06:24:45 2014	(r357105)
@@ -1,2 +1,2 @@
-SHA256 (postgresql/postgresql-jdbc-9.1-902.src.tar.gz) = 7f99c2307ae53d28412cc69ba75066e428d8fa6b567f1f1ea0acbb5d785cfc69
-SIZE (postgresql/postgresql-jdbc-9.1-902.src.tar.gz) = 606514
+SHA256 (postgresql/postgresql-jdbc-9.2-1004.src.tar.gz) = eeadff0d830cd19a4f52a9489748a7126b0c1d4863bf9a5d65618158dfc6ae68
+SIZE (postgresql/postgresql-jdbc-9.2-1004.src.tar.gz) = 1842921

Modified: head/databases/postgresql-jdbc/files/patch-build-xml
==============================================================================
--- head/databases/postgresql-jdbc/files/patch-build-xml	Mon Jun  9 05:07:54 2014	(r357104)
+++ head/databases/postgresql-jdbc/files/patch-build-xml	Mon Jun  9 06:24:45 2014	(r357105)
@@ -1,6 +1,6 @@
---- build.xml.orig	2007-10-15 09:49:36.000000000 +0200
-+++ build.xml	2008-01-22 13:52:37.000000000 +0100
-@@ -109,10 +109,7 @@
+--- build.xml.orig	2013-10-31 14:48:34.000000000 +0100
++++ build.xml	2014-06-09 08:19:22.000000000 +0200
+@@ -221,10 +221,7 @@
  
    <target name="compile" depends="prepare,check_versions,driver">
  
@@ -9,6 +9,6 @@
 -
 -    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
 +    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
-       <!-- This is the core of the driver.  It is common for all versions. -->
-        <include name="${package}/*.java" />
-        <include name="${package}/core/**" />
+       <patternset refid="jdbc.version.src.pattern"/>
+     </javac>
+   </target>