Attachment 37264 Details for Bug 59397 – postgresql-jdbc-7.4.patch

[patch] postgresql-jdbc-7.4.patch

postgresql-jdbc-7.4.patch (text/plain), 2.86 KB, created by Palle Girgensohn on 2003-11-18 04:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2003-11-18 04:00:39 UTC

Size: 2.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/postgresql-jdbc/Makefile,v
>retrieving revision 1.9
>diff -u -u -r1.9 Makefile
>--- Makefile	4 Sep 2003 12:03:58 -0000	1.9
>+++ Makefile	18 Nov 2003 03:54:08 -0000
>@@ -4,27 +4,20 @@
> #
> # $FreeBSD: ports/databases/postgresql-jdbc/Makefile,v 1.9 2003/09/04 12:03:58 osa Exp $
> #
>-POSTGRESQL_PORT?=	databases/postgresql7
> 
>-PORTNAME=	postgresql
>-PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
>-PORTREVISION?=	0
>+PORTREVISION=	0
> CATEGORIES=	databases java
>-MASTER_SITES=	${MASTER_SITE_PGSQL}
>-MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
> PKGNAMESUFFIX=	-jdbc
>-DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
>-DIST_SUBDIR=	postgresql
> 
> MAINTAINER=	girgen@pingpong.net
> COMMENT=	The Java JDBC implementation for PostgreSQL
> 
> BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
> 
>-MD5_FILE=	${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
>+POSTGRESQL_PORT?=	databases/postgresql7
>+POSTGRESQL_SUBPORT=YES
>+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
> 
>-USE_GMAKE=	YES
>-GNU_CONFIGURE=	YES
> CONFIGURE_ARGS=	--with-java
> 
> USE_JAVA=	1.1+
>Index: files/patch-aa
>===================================================================
>RCS file: /home/ncvs/ports/databases/postgresql-jdbc/files/patch-aa,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-aa
>--- files/patch-aa	28 Mar 2003 13:45:16 -0000	1.1
>+++ files/patch-aa	18 Nov 2003 02:37:32 -0000
>@@ -1,11 +1,14 @@
>---- src/interfaces/jdbc/build.xml.orig	Fri Mar 28 09:55:21 2003
>-+++ src/interfaces/jdbc/build.xml	Fri Mar 28 09:57:29 2003
>-@@ -101,7 +101,7 @@
>+--- src/interfaces/jdbc/build.xml.orig	Mon Aug 25 00:10:09 2003
>++++ src/interfaces/jdbc/build.xml	Tue Nov 18 03:37:21 2003
>+@@ -110,10 +110,7 @@
>  
>-   
>    <target name="compile" depends="prepare,check_versions,driver">
>--    <javac srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
>-+    <javac includeAntRuntime="no" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
>-       <include name="${package}/**" />
>  
>-       <exclude name="${package}/jdbc1/**" unless="jdbc1"/>
>+-    <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}">
>++    <javac includeAntRuntime="no" classpath="{$srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
>+       
>+        <include name="${package}/*.java" />
>+        <include name="${package}/core/**" />

Actions: View | Diff

Attachments on bug 59397: 37264