- Update to 1.0.0 [1]

- Add 'graphics' category [2]
- Move RUN_DEPENDS [2]
- Use USE_ANT
- JAVAJARDIR -> JAVALIBDIR
- Do not set JAVA_BUILD/JAVA_RUN, just set NO_BUILD when needed
- Cleanup: remove now useless PLIST_SUB entries
- ECHO_CMD -> ECHO_MSG
- Trim whitespaces in pkg-descr

Reported by:	thierry [1], portlint [2]

3 files changed, 25 insertions, 40 deletions

diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile
index 869b4bfcdf5b..5a4f06221fdc 100644
--- a/java/jfreechart/Makefile
+++ b/java/jfreechart/Makefile
@@ -7,40 +7,32 @@
 #
 
 PORTNAME=	jfreechart
-PORTVERSION=	0.9.20
-CATEGORIES=	java
+PORTVERSION=	1.0.0
+CATEGORIES=	java graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free Java class library for generating charts
 
+RUN_DEPENDS=	${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 
-RUN_DEPENDS=	${JAVAJARDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
-
-.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
+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
 
-EXTRAJARS=	gnujaxp.jar
-
-PLIST_SUB+=	JAVAJARDIR=${JAVAJARDIR:S|^${PREFIX}/||}
 PLIST_FILES=	%%JAVAJARDIR%%/jfreechart.jar \
 		%%JAVAJARDIR%%/gnujaxp.jar
 
@@ -51,28 +43,21 @@ 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}/..."
+.if defined(WITHOUT_COMPILE)
+	@${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+.else
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@for exjar in ${EXTRAJARS}; do					\
-		${INSTALL_DATA} ${WRKSRC}/lib/$$exjar ${JAVAJARDIR} ;	\
-	done
-	@${ECHO_CMD} " [DONE]"
-
-do-install-javadoc:
-.if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
+.endif
+	@${INSTALL_DATA} ${WRKSRC}/lib/gnujaxp.jar ${JAVAJARDIR}/gnujaxp.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
 
 post-install:
diff --git a/java/jfreechart/distinfo b/java/jfreechart/distinfo
index a06813cb970b..9d0bb19cade5 100644
--- a/java/jfreechart/distinfo
+++ b/java/jfreechart/distinfo
@@ -1,3 +1,3 @@
-MD5 (jfreechart-0.9.20.tar.gz) = 9543735aee7e61e643362007fe96f5a8
-SHA256 (jfreechart-0.9.20.tar.gz) = 9d6a28f8d3bb0f3812349012206a65fc3643e9c7a243223e4ba50a71754c92ef
-SIZE (jfreechart-0.9.20.tar.gz) = 3088088
+MD5 (jfreechart-1.0.0.tar.gz) = df5f7d75a011eb7a6e0eec4a86353245
+SHA256 (jfreechart-1.0.0.tar.gz) = 710c21002c2cdb760e045e2cde6b4ed39d88419631e4674dc195f2657194ec8f
+SIZE (jfreechart-1.0.0.tar.gz) = 3045009
diff --git a/java/jfreechart/pkg-descr b/java/jfreechart/pkg-descr
index fe0447e82945..577678f9bb48 100644
--- a/java/jfreechart/pkg-descr
+++ b/java/jfreechart/pkg-descr
@@ -1,4 +1,4 @@
- JFreeChart is a free Java class library for generating charts, including:
+JFreeChart is a free Java class library for generating charts, including:
     * pie charts;
     * bar charts (regular and stacked, with an optional 3D effect);
     * line and area charts;