- Update to 1.0b10

- Use USE_ANT
- Set USE_JIKES=no to forbid the use of Jikes to build the port
- Use %%JAVAJARDIR%%
- Use ${INSTALL_DATA} and ${CPIO} rather than ${CP} [1]
- Use ${ECHO_MSG} rather than ${ECHO}
- Add 'textproc' category
- Fix LOCALBASE/PREFIX issue with JAVAJARDIR [1]

PR:		68511
Submitted by:	me
Reviewed by:	glewis [1]
Approved by:	znerd (maintainer), glewis (mentor)

3 files changed, 61 insertions, 52 deletions

diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index c9687d971475..96fbe0c26356 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -6,53 +6,49 @@
 #
 
 PORTNAME=	jdom
-PORTVERSION=	1.0b9
-PORTREVISION=	1
-CATEGORIES=	java
+PORTVERSION=	1.0b10
+CATEGORIES=	java textproc
 MASTER_SITES=	http://www.jdom.org/dist/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/[0-9]*\.[0-9]*//}
 
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Java library for accessing and manipulating XML documents
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
-RUN_DEPENDS=	${JAVAJARDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen
+RUN_DEPENDS=	${LOCAL_JAVAJARDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
+USE_ANT=	yes
+USE_JIKES=	no
 
+LOCAL_JAVAJARDIR=	${JAVAJARDIR:S,^${PREFIX},${LOCALBASE},}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[0-9]*\.[0-9]*//}
-ANT?=		${LOCALBASE}/bin/ant
-ANT_TARGET=	package
+ALL_TARGET=	package
 .if !defined(NOPORTDOCS)
-ANT_TARGET+=	javadoc
+ALL_TARGET+=	javadoc
 OTHERDOCS=	README.txt TODO.txt CHANGES.txt COMMITTERS.txt LICENSE.txt
 PORTDOCS=	apidocs ${OTHERDOCS}
 .endif
 
-PLIST_FILES=	${JAVAJARDIR:S,^${PREFIX}/,,}/jdom.jar
+MAKE_ENV+=	CLASSPATH=${LOCAL_JAVAJARDIR}/jaxen-jdom.jar
 
-do-build:
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+PLIST_FILES=	%%JAVAJARDIR%%/jdom.jar
 
 do-install:
-	@${ECHO} -n ">> Installing JAR in ${JAVAJARDIR}..."
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/jdom.jar..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${CP} ${WRKSRC}/build/jdom.jar ${JAVAJARDIR}/
-	@${ECHO} " jdom.jar [ DONE ]"
+	@${INSTALL_DATA} ${WRKSRC}/build/jdom.jar ${JAVAJARDIR}/
+	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO} -n ">> Installing samples in ${EXAMPLESDIR}..."
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -r ${WRKSRC}/samples/* ${EXAMPLESDIR}/
-	@${ECHO} " [ DONE ]"
-	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-.for PORTDOC in ${OTHERDOCS}
-	@${CP} ${WRKSRC}/${PORTDOC} ${DOCSDIR}/
-	@${ECHO} -n " ${PORTDOC}"
-.endfor
-	@${CP} -r ${WRKSRC}/build/apidocs ${DOCSDIR}/
-	@${ECHO} " apidocs [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
+	@cd ${WRKSRC}/build/samples/ && ${FIND} . \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
+	@${ECHO_MSG} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/build/ && ${FIND} apidocs \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jdom/distinfo b/java/jdom/distinfo
index 0f29391d2506..c32d7e056ac3 100644
--- a/java/jdom/distinfo
+++ b/java/jdom/distinfo
@@ -1,2 +1,2 @@
-MD5 (jdom-b9.tar.gz) = 593c7bbbd939eb0513444d2c61e5aca0
-SIZE (jdom-b9.tar.gz) = 3417274
+MD5 (jdom-b10.tar.gz) = 39323441e0e69fbf2458981b73477098
+SIZE (jdom-b10.tar.gz) = 3565663
diff --git a/java/jdom/pkg-plist b/java/jdom/pkg-plist
index c0f31dedb1bf..14609a1defd3 100644
--- a/java/jdom/pkg-plist
+++ b/java/jdom/pkg-plist
@@ -1,31 +1,44 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLWriter.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DataUnformatFilter.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DocumentReader.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/FilterTest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/ReaderTest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/test1.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/web.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/testNamespaces.xml
 %%PORTDOCS%%%%EXAMPLESDIR%%/sax/test2.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLFilterBase.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/test1.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLWriter.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLWriter.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLReaderBase.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLReaderBase.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLFilterBase.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/XMLFilterBase.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/ReaderTest.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/ReaderTest.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/FilterTest.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/FilterTest.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DocumentReader.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DocumentReader.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DataUnformatFilter.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DataUnformatFilter.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/sax/DataFormatFilter.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/catalog.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/cdata.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/contents.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/Count.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/DOMBuilderDemo.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/fibo.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/inline.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/sax/DataFormatFilter.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/namespaces.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderDemo.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderTestEntity.dtd
-%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderTestEntity.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderTestEntity2.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/testNamespaces.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/TestXMLOutputter.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/WarReader.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/web.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/XPathReader.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/inline.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/fibo.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/contents.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/cdata.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/catalog.xsl
 %%PORTDOCS%%%%EXAMPLESDIR%%/catalog.xml
 %%PORTDOCS%%%%EXAMPLESDIR%%/XSLTransform.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/XSLTransform.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/XPathReader.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/XPathReader.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/WarReader.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/WarReader.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderTestEntity2.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderTestEntity.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderTestEntity.dtd
+%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderDemo.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/SAXBuilderDemo.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/DescendantDemo.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/DescendantDemo.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Count.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/Count.class
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/sax
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/