- Update to 1.0 Final (bumped PORTEPOCH in this extend)

- re-enable jikes support
- Dynamic pkg-plist
- Use JAVALIBDIR

Approved by:	glewis (mentor)

3 files changed, 15 insertions, 54 deletions

diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index 1c08e703847c..339d6f5d268f 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	jdom
-PORTVERSION=	1.0b10
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	java textproc
-MASTER_SITES=	http://www.jdom.org/dist/source/archive/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/[0-9]*\.[0-9]*//}
+MASTER_SITES=	http://www.jdom.org/dist/source/
 
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Java library for accessing and manipulating XML documents
 
-RUN_DEPENDS=	${LOCAL_JAVAJARDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen
+RUN_DEPENDS=	${JAVALIBDIR}/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]*//}
 ALL_TARGET=	package
 .if !defined(NOPORTDOCS)
 ALL_TARGET+=	javadoc
@@ -30,7 +27,7 @@ OTHERDOCS=	README.txt TODO.txt CHANGES.txt COMMITTERS.txt LICENSE.txt
 PORTDOCS=	apidocs ${OTHERDOCS}
 .endif
 
-MAKE_ENV+=	CLASSPATH=${LOCAL_JAVAJARDIR}/jaxen-jdom.jar
+MAKE_ENV+=	CLASSPATH=${JAVALIBDIR}/jaxen-jdom.jar
 
 PLIST_FILES=	%%JAVAJARDIR%%/jdom.jar
 
@@ -53,4 +50,12 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
+.if !defined(NOPORTDOCS)
+post-install:
+	@${FIND} -s ${WRKSRC}/build/samples -not -type d | \
+		${SED} -ne 's,^${WRKSRC}/build/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${FIND} -s -d ${WRKSRC}/build/samples -type d | \
+		${SED} -ne 's,^${WRKSRC}/build/samples,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+.endif
+
 .include <bsd.port.mk>
diff --git a/java/jdom/distinfo b/java/jdom/distinfo
index c32d7e056ac3..9a8e6b3e7e1f 100644
--- a/java/jdom/distinfo
+++ b/java/jdom/distinfo
@@ -1,2 +1,2 @@
-MD5 (jdom-b10.tar.gz) = 39323441e0e69fbf2458981b73477098
-SIZE (jdom-b10.tar.gz) = 3565663
+MD5 (jdom-1.0.tar.gz) = ce29ecc05d63fdb419737fd00c04c281
+SIZE (jdom-1.0.tar.gz) = 3571788
diff --git a/java/jdom/pkg-plist b/java/jdom/pkg-plist
deleted file mode 100644
index 14609a1defd3..000000000000
--- a/java/jdom/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/web.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/testNamespaces.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/sax/test2.xml
-%%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%%/sax/DataFormatFilter.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/namespaces.xml
-%%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%%/