Attachment #142845 for bug #189934

View | Details | Raw Unified | Return to bug 189934
Collapse All | Expand All

Lines 2-9 Link Here

(-)b/databases/postgresql-jdbc/Makefile (-13 / +24 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= postgresql	4	PORTNAME= postgresql
5	PORTVERSION= 9.1.902	5	PORTVERSION= 9.3.1101
6	PORTREVISION= 1
7	DISTVERSIONSUFFIX=.src	6	DISTVERSIONSUFFIX=.src
8	CATEGORIES= databases java	7	CATEGORIES= databases java
9	MASTER_SITES= http://jdbc.postgresql.org/download/	8	MASTER_SITES= http://jdbc.postgresql.org/download/
Lines 15-42 COMMENT= The Java JDBC implementation for PostgreSQL Link Here
15		14
16	DIST_SUBDIR= postgresql	15	DIST_SUBDIR= postgresql
17		16
		17	OPTIONS_DEFINE= DOCS
		18
18	USE_ANT= yes	19	USE_ANT= yes
19	USE_JAVA= yes	20	USE_JAVA= yes
20		21
21	PLIST_FILES= %%JAVAJARDIR%%/postgresql.jar	22	JAR_FILE= postgresql-${DISTVERSION:C/.([0-9][0-9][0-9]*)/-\1/g}.${JDBCVER}.jar
		23
		24	PLIST_FILES= %%JAVAJARDIR%%/${JAR_FILE}
22	PORTDOCS= *	25	PORTDOCS= *
23	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}	26	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
24	SUB_FILES= pkg-message	27	SUB_FILES= pkg-message
		28	SUB_LIST= JAR_FILE=${JAR_FILE}
25		29
26	NO_STAGE= yes	30	.include <bsd.port.options.mk>
27	post-patch:
28	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README
29		31
30	OPTIONS_DEFINE= DOCS	32	.include <bsd.port.pre.mk>
31		33
32	.include <bsd.port.options.mk>	34	.if "${JAVA_PORT_VERSION}" == "1.6.0"
		35	JDBCVER= jdbc4
		36	.elif "${JAVA_PORT_VERSION}" == "1.7.0" \|\| "${JAVA_PORT_VERSION}" == "1.8.0"
		37	JDBCVER= jdbc41
		38	.else
		39	IGNORE= Unsupported Java version
		40	.endif
		41
		42	post-patch:
		43	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README.md
		44	${REINPLACE_CMD} 's,postgresql\.jar,${JAR_FILE},' ${WRKSRC}/README.md
33		45
34	do-install:	46	do-install:
35	@ ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${JAVAJARDIR}/postgresql.jar	47	@ ${INSTALL_DATA} ${WRKSRC}/jars/${JAR_FILE} ${STAGEDIR}${JAVAJARDIR}/
36	.if ${PORT_OPTIONS:MDOCS}	48	.if ${PORT_OPTIONS:MDOCS}
37	${MKDIR} ${DOCSDIR}	49	${MKDIR} ${STAGEDIR}${DOCSDIR}
38	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	50	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
39	.endif	51	.endif
40	@${CAT} ${PKGMESSAGE}
41		52
42	.include <bsd.port.mk>	53	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)b/databases/postgresql-jdbc/distinfo (-2 / +2 lines)
1	SHA256 (postgresql/postgresql-jdbc-9.1-902.src.tar.gz) = 7f99c2307ae53d28412cc69ba75066e428d8fa6b567f1f1ea0acbb5d785cfc69	1	SHA256 (postgresql/postgresql-jdbc-9.3-1101.src.tar.gz) = 1a41e7dab3d7627d4922d002e9a486f59532a387cf1d8b544192980494cd549a
2	SIZE (postgresql/postgresql-jdbc-9.1-902.src.tar.gz) = 606514	2	SIZE (postgresql/postgresql-jdbc-9.3-1101.src.tar.gz) = 1856965




--- build.xml.orig
+++ build.xml
@@ -228,7 +228,7 @@
     <available classname="org.postgresql.Driver" property="old.driver.present" />
     <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
 
   <target name="compile" depends="prepare,check_versions,driver">
 
-    <available classname="org.postgresql.Driver" property="old.driver.present" />
-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
-
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
+    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
       <patternset refid="jdbc.version.src.pattern"/>
     </javac>
   </target>

Lines 1-5 Link Here

(-)b/databases/postgresql-jdbc/files/pkg-message.in (-2 / +2 lines)
1	PostgreSQL JDBC support installed!	1	PostgreSQL JDBC support installed!
2		2
3	postgresql.jar resides in	3	%%JAR_FILE%% resides in
4	%%JAVAJARDIR%%/postgresql.jar	4	%%JAVAJARDIR%%/%%JAR_FILE%%
5	Add this to your CLASSPATH!	5	Add this to your CLASSPATH!

Return to bug 189934

Lines 1-14 Link Here

(-)b/databases/postgresql-jdbc/files/patch-build-xml (-12 / +9 lines)
1	--- build.xml.orig 2007-10-15 09:49:36.000000000 +0200	1	--- build.xml.orig
2	+++ build.xml 2008-01-22 13:52:37.000000000 +0100	2	+++ build.xml
3	@@ -109,10 +109,7 @@	3	@@ -228,7 +228,7 @@
		4	<available classname="org.postgresql.Driver" property="old.driver.present" />
		5	<fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
4		6
5	<target name="compile" depends="prepare,check_versions,driver">
6
7	- <available classname="org.postgresql.Driver" property="old.driver.present" />
8	- <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
9	-
10	- <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">	7	- <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
11	+ <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">	8	+ <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
12	<!-- This is the core of the driver. It is common for all versions. -->	9	<patternset refid="jdbc.version.src.pattern"/>
13	<include name="${package}/*.java" />	10	</javac>
14	<include name="${package}/core/**" />	11	</target>