ports/70364: [PATCH] textproc/ant-xinclude-task: Unbreak and upgrade

[Herve Quiroz]

>Number:         70364
>Category:       ports
>Synopsis:       [PATCH] textproc/ant-xinclude-task: Unbreak and upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 12 13:10:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Herve Quiroz
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #5: Mon Aug  2 19:39:13 CEST
>Description:

- Unbreak port by patching build.xml
- bsd.java.mk 2.0 compliance
- ${CP} -> ${INSTALL_DATA}
- ${ECHO} -> ${ECHO_MSG}
- Use USE_ANT
- Use PLIST_FILES to remove pkg-plist
- Finer tuning of CLASSPATH (only xincluder.jar, not the whole ${JAVAJARDIR}
  content)

Added file(s):
- files/patch-build.xml

Removed file(s):
- pkg-plist

Port maintainer (znerd at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- ant-xinclude-task-0.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/textproc/ant-xinclude-task/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile	9 Jun 2004 03:10:54 -0000	1.10
+++ Makefile	12 Aug 2004 13:01:57 -0000
@@ -14,35 +14,32 @@
 MAINTAINER=	znerd at FreeBSD.org
 COMMENT=	XInclude task for Jakarta Ant
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
-		${JAVASHAREDIR}/classes/xincluder.jar:${PORTSDIR}/textproc/xincluder
+BUILD_DEPENDS=	${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder
 
-BROKEN=		Install fails
+USE_JAVA=	yes
+JAVA_VERSION=	1.1+
+USE_ANT=	yes
 
-USE_JAVA=	1.1+
-
-ANT?=		${LOCALBASE}/bin/ant
-.if defined(NOPORTDOCS)
-ANT_TARGET=	jar
-.else
-ANT_TARGET=	jar apidocs
+ALL_TARGET=	jar
+.if !defined(NOPORTDOCS)
+ALL_TARGET+=	apidocs
 PORTDOCS=	*
 .endif
+MAKE_ENV+=	CLASSPATH=${JAVAJARDIR}/xincluder.jar
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET}
+PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 do-install:
-
-	@${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${CP} ${WRKSRC}/build/${PORTNAME}.jar ${JAVAJARDIR}/
-	@${ECHO} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
+	@${MKDIR} ${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.jar ${JAVAJARDIR}/
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -r ${WRKSRC}/build/apidocs/* ${DOCSDIR}
-	@${ECHO} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/build/apidocs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
+	@cd ${WRKSRC}/build/apidocs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";"
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	20 Apr 2004 19:35:58 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-share/java/classes/xinclude-task.jar
Index: files/patch-build.xml
===================================================================
RCS file: files/patch-build.xml
diff -N files/patch-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-build.xml	12 Aug 2004 12:53:26 -0000
@@ -0,0 +1,11 @@
+--- build.xml.orig	Thu Aug 12 12:17:41 2004
++++ build.xml	Thu Aug 12 12:20:10 2004
+@@ -144,8 +144,6 @@
+ 		windowtitle="${javadoc.title}"
+ 		doctitle="${javadoc.title}"
+ 		bottom="${javadoc.footer}">
+-			<link href="http://java.sun.com/j2se/${java.specification.version}/docs/api" />
+-			<link href="http://people.FreeBSD.org/~znerd/ant15-apidocs" />
+ 		</javadoc>
+ 	</target>
+ 
--- ant-xinclude-task-0.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: