Attachment 41598 Details for Bug 65063 – apache-ant-1.6.1.patch

[patch] apache-ant-1.6.1.patch

apache-ant-1.6.1.patch (text/plain), 1.77 KB, created by Hervé Quiroz on 2004-04-02 10:00:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hervé Quiroz

Created: 2004-04-02 10:00:28 UTC

Size: 1.77 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/apache-ant.original/Makefile /usr/ports/devel/apache-ant/Makefile
>--- /usr/ports/devel/apache-ant.original/Makefile	Fri Apr  2 10:23:52 2004
>+++ /usr/ports/devel/apache-ant/Makefile	Fri Apr  2 10:29:12 2004
>@@ -15,14 +15,16 @@
> 		http://www.esil.univ-mrs.fr/~hquiroz/:man
> DISTFILES=	${ANT_DISTFILE}:bin \
> 		${MANPAGE_DISTFILE}:man
>+EXTRACT_ONLY=	${ANT_DISTFILE}
> 
> MAINTAINER=	znerd@FreeBSD.org
> COMMENT=	Java- and XML-based build tool, conceptually similar to make
> 
>+RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper
>+
> ANT_DISTFILE=	${PORTNAME}-${PORTVERSION}-bin.tar.bz2
> MANPAGE_DISTFILE=	${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
> MANPAGE_VERSION=	20030908
>-EXTRACT_ONLY=	${ANT_DISTFILE}
> USE_BZIP2=	yes
> USE_JAVA=	1.2+
> 
>diff -ruN --exclude=CVS /usr/ports/devel/apache-ant.original/files/ant /usr/ports/devel/apache-ant/files/ant
>--- /usr/ports/devel/apache-ant.original/files/ant	Fri Apr  2 10:23:52 2004
>+++ /usr/ports/devel/apache-ant/files/ant	Fri Apr  2 10:24:45 2004
>@@ -69,17 +69,15 @@
> 
> # FreeBSD-specific: Add the .jar files from ${PREFIX}/share/java/classes
> if [ "${ANT_INCLUDE_SHARED_JARS}" = "YES" ]; then
>-	for JAR_FILE in "%%PREFIX%%/share/java/classes"/*.jar; do
>-
>-		# If the directory is empty, then the input string is returned
>-		if [ -f "${JAR_FILE}" ]; then
>-			if [ -z "${LOCALCLASSPATH}" ]; then
>-				LOCALCLASSPATH="${JAR_FILE}"
>-			else
>-				LOCALCLASSPATH="${JAR_FILE}":"${LOCALCLASSPATH}"
>-			fi
>-		fi
>-	done
>+	CLASSPATH_CMD=/usr/local/bin/classpath
>+	if [ -x "${CLASSPATH_CMD}" ]; then
>+		SHARED_JARS=`${CLASSPATH_CMD}`
>+		LOCALCLASSPATH=${SHARED_JARS}:"${LOCALCLASSPATH}"
>+	else
>+		echo "Error: ${CLASSPATH_CMD} is not present on your system"
>+		echo "       you should install the java/javavmwrapper port"
>+		exit 1
>+	fi
> fi

Actions: View | Diff

Attachments on bug 65063: 41598