Update version 0.15.0 -> 0.17.0.

svn path=/head/; revision=40314

textproc/fop/Makefile

@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	fop
-PORTVERSION=	0.15.0
+PORTVERSION=	0.17.0
 CATEGORIES=	textproc java
 MASTER_SITES=	http://xml.apache.org/dist/fop/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
+MASTER_SITE_SUBDIR=	recent
+DISTNAME=	${PORTNAME:S/fop/Fop/}-${PORTVERSION}
 
 MAINTAINER=	kiri@FreeBSD.org
 
-RUN_DEPENDS=    ${LOCALBASE}/jdk${JDKVERSION}/bin/java:${PORTSDIR}/java/jdk \
+RUN_DEPENDS=	${LOCALBASE}/jdk${JDKVERSION}/bin/java:${PORTSDIR}/java/jdk \
 		${LOCALBASE}/share/java/classes/xerces.jar:${PORTSDIR}/textproc/xerces
 
 WRKSRC=		${WRKDIR}/xml-fop
@@ -24,13 +25,21 @@ JDKVERSION=	1.1.8
 JAVACLASSDIR=	${PREFIX}/share/java/classes
 JAVADATADIR=	${PREFIX}/share/java/${PKGNAME}
 
-do-install:
+do-extract:
+	${MKDIR} ${WRKSRC}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
+		${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+
+pre-install:
 	${MKDIR} ${JAVACLASSDIR} ${JAVADATADIR}
-	${INSTALL_DATA} ${WRKSRC}/build/fop.jar ${JAVACLASSDIR}
+	find ${WRKSRC} \( -name \*.orig -o -name \*~ -o -name CVS \) -exec ${RM} -rf \{} \;
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/fop.jar ${JAVACLASSDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/w3c.jar ${JAVACLASSDIR}/svg-w3c.jar
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} LICENSE README STATUS build.xml ${JAVADATADIR}; \
 		${INSTALL_SCRIPT} build.sh ${JAVADATADIR}; \
-		${CP} -R docs lib src ${JAVADATADIR}
+		${CP} -R conf docs hyph javadocs lib src ${JAVADATADIR}
 
 .include <bsd.port.mk>

textproc/fop/distinfo

@@ -1 +1 @@
-MD5 (fop-0_15_0.tar.gz) = f398785999a7170b9526f4426c22ce48
+MD5 (Fop-0.17.0.tar.gz) = 9337b5e69a7efcfb076a46b6cc07e2b2