ports/67322: [PATCH] Upgrade java/jfreechart to 0.9.18

[Sepherosa Ziehau]

>Number:         67322
>Category:       ports
>Synopsis:       [PATCH] Upgrade java/jfreechart to 0.9.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 28 21:20:17 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sepherosa Ziehau
>Release:        5.2-current
>Organization:
>Environment:
FreeBSD sephe 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sun May 23 20:46:09 CST 2004     root at sephe:/usr/obj/usr/src/sys/TRIM  i386      
>Description:
    Upgrade java/jfreechart to 0.9.18. Tweak original port a little according to ports' CHANGES file.  It is quite appreciated if I can take over the maintainership.   
>How-To-Repeat:
      
>Fix:
diff -urN jfreechart.orig/Makefile jfreechart/Makefile
--- jfreechart.orig/Makefile	Wed May 26 20:28:39 2004
+++ jfreechart/Makefile	Sat May 29 11:51:42 2004
@@ -7,34 +7,66 @@
 #
 
 PORTNAME=	jfreechart
-PORTVERSION=	0.9.16
+PORTVERSION=	0.9.18
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	sepherosa at softhome.net
 COMMENT=	A free Java class library for generating charts
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 
-PLIST_FILES=	share/java/classes/jfreechart.jar
-USE_JAVA=	1.2+
+RUN_DEPENDS=	${JAVAJARDIR}/log4j.jar:${PORTSDIR}/java/jakarta-log4j \
+		${JAVAJARDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
 
-ANT?=		${LOCALBASE}/bin/ant
+.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
+.else
+JAVA_RUN=	yes
+.endif
+
 .if !defined(NOPORTDOCS)
 ANT_TARGETS+=	javadoc
 PORTDOCS=	*
 .endif
 
+EXTRAJARS=	gnujaxp.jar
+
+PLIST_FILES=	share/java/classes/jfreechart.jar \
+		share/java/classes/gnujaxp.jar
+
+pre-fetch:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${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:
+do-install-jar:
 	@${ECHO_CMD} -n  ">> Installing .jar file..."
 	@${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}..."
 	@${MKDIR} ${DOCSDIR}
@@ -42,5 +74,8 @@
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@${ECHO_CMD} " [DONE]"
 .endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -urN jfreechart.orig/distinfo jfreechart/distinfo
--- jfreechart.orig/distinfo	Wed May 26 20:28:39 2004
+++ jfreechart/distinfo	Wed May 26 21:19:47 2004
@@ -1,2 +1,2 @@
-MD5 (jfreechart-0.9.16.tar.gz) = 3060af9fae4c3458dfd3b93744302d67
-SIZE (jfreechart-0.9.16.tar.gz) = 2326963
+MD5 (jfreechart-0.9.18.tar.gz) = 94919423c48d1495a1bc3250bd861857
+SIZE (jfreechart-0.9.18.tar.gz) = 3353857
diff -urN jfreechart.orig/pkg-message jfreechart/pkg-message
--- jfreechart.orig/pkg-message	Thu Jan  1 08:00:00 1970
+++ jfreechart/pkg-message	Wed May 26 22:31:39 2004
@@ -0,0 +1,6 @@
+**************************************************************
+
+In order to use classes in org.jfree.chart.servlet package,
+please put Java Servlet 2.3 implementation in class path.
+
+**************************************************************

>Release-Note:
>Audit-Trail:
>Unformatted: