Attachment 76642 Details for Bug 110442 – file.diff

[patch] file.diff

file.diff (text/plain), 3.66 KB, created by Nemo Liu on 2007-03-17 11:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nemo Liu

Created: 2007-03-17 11:50:01 UTC

Size: 3.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/jakarta-commons-dbutils/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- Makefile	9 Jun 2006 21:18:38 -0000	1.2
>+++ Makefile	17 Mar 2007 11:21:47 -0000
>@@ -2,18 +2,18 @@
> # Date created:			14 Feb 2006
> # Whom:				Michael Winking <mwfp@foldl.net>
> #
>-# $FreeBSD: ports/databases/jakarta-commons-dbutils/Makefile,v 1.2 2006/06/09 21:18:38 linimon Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	commons-dbutils
>-PORTVERSION=	1.0
>+PORTVERSION=	1.1
> CATEGORIES=	databases java
> MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
> MASTER_SITE_SUBDIR=	commons/dbutils/source
> PKGNAMEPREFIX=	jakarta-
> DISTNAME=	${PORTNAME}-${PORTVERSION}-src
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	nemoliu@gmail.com
> COMMENT=	JDBC helper library
> 
> BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
>@@ -24,7 +24,7 @@
> 
> MAKE_ARGS=	-cp ${JAVAJARDIR}/junit.jar
> ALL_TARGET=	dist
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
> PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
> 
> .if !defined(NOPORTDOCS)
>@@ -33,8 +33,7 @@
> 
> do-install:
> 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
>-# strangely the jar archive from a 1.0 build contains 1.1 as version number
>-	@${INSTALL_DATA} ${WRKSRC}/dist/commons-dbutils-1.1-dev.jar \
>+	@${INSTALL_DATA} ${WRKSRC}/dist/commons-dbutils-1.1.jar \
> 		${JAVAJARDIR}/${PORTNAME}.jar
> 	@${ECHO_MSG} " [DONE]"
> .if !defined(NOPORTDOCS)
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/databases/jakarta-commons-dbutils/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- distinfo	16 Feb 2006 15:45:51 -0000	1.1
>+++ distinfo	17 Mar 2007 11:21:59 -0000
>@@ -1,3 +1,3 @@
>-MD5 (commons-dbutils-1.0-src.tar.gz) = 811b2d6e5c8c519c6196464ab89252a9
>-SHA256 (commons-dbutils-1.0-src.tar.gz) = 6bf5376457ca201d9086cd42d16a026ba0d2254912517bbbfeea64e806dd41a2
>-SIZE (commons-dbutils-1.0-src.tar.gz) = 28707
>+MD5 (commons-dbutils-1.1-src.tar.gz) = c970930b515983e0882c0aaab73725e2
>+SHA256 (commons-dbutils-1.1-src.tar.gz) = 645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59
>+SIZE (commons-dbutils-1.1-src.tar.gz) = 60062
>Index: files/patch-build.xml
>===================================================================
>RCS file: files/patch-build.xml
>diff -N files/patch-build.xml
>--- files/patch-build.xml	16 Feb 2006 15:45:51 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,20 +0,0 @@
>-# use installed junit, instead of unnecessarily downloading and and building a custom one (which didn't work anyway)
>-*** build.xml.old	Sun Jan  1 09:43:41 2006
>---- build.xml	Sun Jan  1 09:32:51 2006
>-***************
>-*** 139,152 ****
>-      </javadoc>
>-    </target>
>-    <target name="get-deps" unless="noget" depends="init">
>--     <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
>--     </get>
>--     <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
>--     </get>
>--     <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
>--     </get>
>--     <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
>--     </get>
>-    </target>
>-    <target name="install-maven">
>-      <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
>---- 139,144 ----

Actions: View | Diff

Attachments on bug 110442: 76642