From 946fa8d45079b96aef1c0994b69440a22e257578 Mon Sep 17 00:00:00 2001
From: hq <hq@FreeBSD.org>
Date: Mon, 6 Feb 2006 23:26:40 +0000
Subject: - Update to 1.0.0 - Add 'devel' category - Use USE_ANT - Do not set
 JAVA_BUILD/JAVA_RUN, just set NO_BUILD when needed - Cleanup: remove now
 useless PLIST_SUB entries - ECHO_CMD -> ECHO_MSG - The port now installs
 another JAR file: jcommon-xml.jar

Tested by:	thierry
---
 java/jcommon/Makefile | 46 ++++++++++++++++------------------------------
 java/jcommon/distinfo |  6 +++---
 2 files changed, 19 insertions(+), 33 deletions(-)

(limited to 'java')

diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile
index 72485c930973..a7ab677cb991 100644
--- a/java/jcommon/Makefile
+++ b/java/jcommon/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	jcommon
-PORTVERSION=	0.9.5
-CATEGORIES=	java
+PORTVERSION=	1.0.0
+CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jfreechart
 
@@ -18,26 +18,20 @@ COMMENT=	A collection of useful classes used by JFreeChart and JFreeReport
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 
-.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
-BUILD_DEPENDS=	${ANT_CMD}:${PORTSDIR}/devel/apache-ant
-ANT_CMD?=	${LOCALBASE}/bin/ant
-ANT=		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
-.endif
-
 .if !defined(WITHOUT_COMPILE)
-JAVA_BUILD=	yes
-ANT_TARGETS=	compile
+USE_ANT=	yes
+ALL_TARGET=	compile-xml
+BUILD_WRKSRC=	${WRKSRC}/ant
 .else
-JAVA_RUN=	yes
+NO_BUILD=	yes
 .endif
 
-.if !defined(NOPORTDOCS)
-ANT_TARGETS+=	javadoc
+.if !defined(NOPORTDOCS) && !defined(WITHOUT_COMPILE)
+ALL_TARGET+=	javadoc
 PORTDOCS=	*
 .endif
 
-PLIST_SUB+=	JAVAJARDIR=${JAVAJARDIR:S|^${PREFIX}/||}
-PLIST_FILES=	%%JAVAJARDIR%%/jcommon.jar
+PLIST_FILES=	%%JAVAJARDIR%%/jcommon.jar %%JAVAJARDIR%%/jcommon-xml.jar
 
 pre-fetch:
 	@${ECHO_MSG} ""
@@ -46,25 +40,17 @@ pre-fetch:
 	@${ECHO_MSG} "    WITHOUT_COMPILE=yes    Install the pre-compiled .jar file"
 	@${ECHO_MSG} ""
 
-do-build:
-.if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/ant && ${ANT} ${ANT_TARGETS}
-.endif
-
-do-install: do-install-jar do-install-javadoc
-
-do-install-jar:
-	@${ECHO_CMD} -n  ">> Installing .jar file..."
+do-install:
+	@${ECHO_MSG} -n  ">> Installing .jar files in ${JAVAJARDIR}/..."
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_CMD} " [DONE]"
-
-do-install-javadoc:
-.if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-xml-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}-xml.jar
+	@${ECHO_MSG} " [DONE]"
+.if !defined(NOPORTDOCS) && !defined(WITHOUT_COMPILE)
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/javadoc && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@${ECHO_CMD} " [DONE]"
+	@${ECHO_MSG} " [DONE]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jcommon/distinfo b/java/jcommon/distinfo
index 9f8048c35d9b..66ed89f147f2 100644
--- a/java/jcommon/distinfo
+++ b/java/jcommon/distinfo
@@ -1,3 +1,3 @@
-MD5 (jcommon-0.9.5.tar.gz) = 111be9d72734f5a5fa5e3d49efe42779
-SHA256 (jcommon-0.9.5.tar.gz) = 8f727379300da986f3bbcfb107cb3ba51f636d646f0565d2829dcb2a13af4c87
-SIZE (jcommon-0.9.5.tar.gz) = 766127
+MD5 (jcommon-1.0.0.tar.gz) = b50e1e787cc73f3512e523c1961f3d06
+SHA256 (jcommon-1.0.0.tar.gz) = 5cb530f1f19fcf806edad4af7eb842604efe79fe2bf2c09838526f4198673385
+SIZE (jcommon-1.0.0.tar.gz) = 1090056
-- 
cgit