- Build from source

- Use USE_ANT
- Now bsd.java.mk 2.0 compliant
- Cosmetic changes: ECHO_CMD -> ECHO_MSG and removed unnecessary variables
- Use CPIO rather than MKDIR/INSTALL_MAN
- Removed pkg-plist
- Install LICENSE.txt
- SIZEify (!)
- Use my FreeBSD address for maintainership purposes
- Removed my name from pkg-descr

Approved by:	glewis (mentor)

4 files changed, 23 insertions, 24 deletions

diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile
index 0241720d952c..bed60c87d63f 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/jakarta-commons-primitives/Makefile
@@ -10,36 +10,38 @@ PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/primitives/binaries
+MASTER_SITE_SUBDIR=	commons/primitives/source
 PKGNAMEPREFIX=	jakarta-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	herve.quiroz@esil.univ-mrs.fr
+MAINTAINER=	hq@FreeBSD.org
 COMMENT=	A library supporting Java primitive types
 
-USE_JAVA=	1.3+
-NO_BUILD=	YES
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
+USE_ANT=	yes
 
-PORT_JARFILE=		${PORTNAME}-${PORTVERSION}.jar
-DEST_JARFILE=		${PORTNAME}.jar
-JAVA_WRKDOCSDIR=	${WRKSRC}/docs
-PLIST_SUB+=		JAVAJARDIR=${JAVAJARDIR:S/^${PREFIX}\///}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+ALL_TARGET=	jar
+
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	apidocs
+ALL_TARGET+=	javadoc
+PORTDOCS=	LICENSE.txt api
 .endif
 
 do-install:
-	@${ECHO_CMD} -n ">> Installing JAR file..."
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORT_JARFILE} ${JAVAJARDIR}/${DEST_JARFILE}
-	@${ECHO_CMD} " [DONE]"
+	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
+	@${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+	@${ECHO_MSG} " [DONE]"
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation..."
-	@cd ${JAVA_WRKDOCSDIR} && ${FIND} . -type d -mindepth 1 -exec ${MKDIR} ${DOCSDIR}/{} ";"
-	@cd ${JAVA_WRKDOCSDIR} && ${FIND} . -type f -exec ${INSTALL_MAN} ${JAVA_WRKDOCSDIR}/{} ${DOCSDIR}/{} ";"
-	@${ECHO_CMD} " [DONE]"
+	@${ECHO_MSG} -n ">> Installing documentation..."
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/target/docs && ${FIND} api \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DOCSDIR}/
+	@${ECHO_MSG} " [DONE]"
 .endif
 
-post-install:
-	@${ECHO_CMD} "${PORTNAME}-${PORTVERSION} installed as ${JAVAJARDIR}/${PORT_JARFILE}"
-
 .include <bsd.port.mk>
diff --git a/java/jakarta-commons-primitives/distinfo b/java/jakarta-commons-primitives/distinfo
index 4ef5a7e548df..1fc7a3ee7cf1 100644
--- a/java/jakarta-commons-primitives/distinfo
+++ b/java/jakarta-commons-primitives/distinfo
@@ -1 +1,2 @@
-MD5 (commons-primitives-1.0.tar.gz) = 2ce92656204f2fa63dad6dfa88e1458b
+MD5 (commons-primitives-1.0-src.tar.gz) = cc561194b876a797fe4ebef473a91764
+SIZE (commons-primitives-1.0-src.tar.gz) = 172369
diff --git a/java/jakarta-commons-primitives/pkg-descr b/java/jakarta-commons-primitives/pkg-descr
index 254e3abbdf1d..8b027b0211ab 100644
--- a/java/jakarta-commons-primitives/pkg-descr
+++ b/java/jakarta-commons-primitives/pkg-descr
@@ -7,6 +7,3 @@ Currently Commons Primitives is primarily composed of implementations of the
 java.util collections adapted for the primitive types.
 
 WWW: http://jakarta.apache.org/commons/primitives
-
-- Herve Quiroz
-herve.quiroz@esil.univ-mrs.fr
diff --git a/java/jakarta-commons-primitives/pkg-plist b/java/jakarta-commons-primitives/pkg-plist
deleted file mode 100644
index 25b83e86324f..000000000000
--- a/java/jakarta-commons-primitives/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%JAVAJARDIR%%/commons-primitives.jar