Update to 0.8.0.34

6 files changed, 28 insertions, 42 deletions

diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index 1886e634bb55..cf778bfbcb0a 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phex
-PORTVERSION=	0.7.3
+PORTVERSION=	0.8.0.34
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}_j2se1.3
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java multi platform and spyware free gnutella client
 
-USE_JAVA=	1.3+
+USE_JAVA=	1.3
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_BUILD_DEPENDS_JAVA=	yes
@@ -26,15 +26,13 @@ JAVAVM=		${LOCALBASE}/bin/javavm
 JAR_DIR=	share/java/jar/${PORTNAME}/
 JAR_MANIFEST=	${FILESDIR}/manifest
 
-DOC_FILES=      COPYING License-RI.html License-W3C.html changelog.txt \
-		contributors.txt readme-Furi.txt readme-developers.txt \
-		GPL.txt \
-		readme.txt
-JAR_FILES=	crimson.jar jaxp.jar phex.jar xalan.jar
+DOC_FILES=	Phex_other.htm Phex_win.htm
+JAR_FILES=	crimson-rt.jar jaxb-api.jar jaxb-libs-rt.jar \
+		jaxb-ri-rt.jar jaxp.jar phex.jar
 
 post-patch:
 # remove trailing ^M
-	@${PERL} -pi -ne 's!\r\n!\n!' ${WRKSRC}/readme/*
+	@${PERL} -pi -ne 's!\r\n!\n!' ${WRKSRC}/docs/readme/*
 	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \
 		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
@@ -48,7 +46,7 @@ do-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/readme/${doc} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/readme/${doc} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net-p2p/phex/distinfo b/net-p2p/phex/distinfo
index d35c64506523..ee209025637a 100644
--- a/net-p2p/phex/distinfo
+++ b/net-p2p/phex/distinfo
@@ -1 +1 @@
-MD5 (phex_0.7.3_j2se1.3.zip) = e4f789619405dd4f9904c0e71fda4aaf
+MD5 (phex_0.8.0.34_j2se1.3.zip) = 416ea3019571f891ef252bb09abf8f45
diff --git a/net-p2p/phex/pkg-plist b/net-p2p/phex/pkg-plist
index 2f4a12624b08..c0a2b8ddc841 100644
--- a/net-p2p/phex/pkg-plist
+++ b/net-p2p/phex/pkg-plist
@@ -1,17 +1,12 @@
 bin/phex
-%%PORTDOCS%%share/doc/phex/COPYING
-%%PORTDOCS%%share/doc/phex/GPL.txt
-%%PORTDOCS%%share/doc/phex/License-RI.html
-%%PORTDOCS%%share/doc/phex/License-W3C.html
-%%PORTDOCS%%share/doc/phex/changelog.txt
-%%PORTDOCS%%share/doc/phex/contributors.txt
-%%PORTDOCS%%share/doc/phex/readme-Furi.txt
-%%PORTDOCS%%share/doc/phex/readme-developers.txt
-%%PORTDOCS%%share/doc/phex/readme.txt
-%%JAR_DIR%%/crimson.jar
+%%PORTDOCS%%%%DOCSDIR%%/Phex_other.htm
+%%PORTDOCS%%%%DOCSDIR%%/Phex_win.htm
+%%JAR_DIR%%/crimson-rt.jar
+%%JAR_DIR%%/jaxb-api.jar
+%%JAR_DIR%%/jaxb-libs-rt.jar
+%%JAR_DIR%%/jaxb-ri-rt.jar
 %%JAR_DIR%%/jaxp.jar
 %%JAR_DIR%%/phex.jar
-%%JAR_DIR%%/xalan.jar
 %%PORTDOCS%%@dirrm share/doc/phex
 @dirrm %%JAR_DIR%%
 @unexec rmdir %D/share/java/jar 2>/dev/null || true
diff --git a/net/phex/Makefile b/net/phex/Makefile
index 1886e634bb55..cf778bfbcb0a 100644
--- a/net/phex/Makefile
+++ b/net/phex/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phex
-PORTVERSION=	0.7.3
+PORTVERSION=	0.8.0.34
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}_j2se1.3
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java multi platform and spyware free gnutella client
 
-USE_JAVA=	1.3+
+USE_JAVA=	1.3
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_BUILD_DEPENDS_JAVA=	yes
@@ -26,15 +26,13 @@ JAVAVM=		${LOCALBASE}/bin/javavm
 JAR_DIR=	share/java/jar/${PORTNAME}/
 JAR_MANIFEST=	${FILESDIR}/manifest
 
-DOC_FILES=      COPYING License-RI.html License-W3C.html changelog.txt \
-		contributors.txt readme-Furi.txt readme-developers.txt \
-		GPL.txt \
-		readme.txt
-JAR_FILES=	crimson.jar jaxp.jar phex.jar xalan.jar
+DOC_FILES=	Phex_other.htm Phex_win.htm
+JAR_FILES=	crimson-rt.jar jaxb-api.jar jaxb-libs-rt.jar \
+		jaxb-ri-rt.jar jaxp.jar phex.jar
 
 post-patch:
 # remove trailing ^M
-	@${PERL} -pi -ne 's!\r\n!\n!' ${WRKSRC}/readme/*
+	@${PERL} -pi -ne 's!\r\n!\n!' ${WRKSRC}/docs/readme/*
 	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \
 		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
@@ -48,7 +46,7 @@ do-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/readme/${doc} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/readme/${doc} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net/phex/distinfo b/net/phex/distinfo
index d35c64506523..ee209025637a 100644
--- a/net/phex/distinfo
+++ b/net/phex/distinfo
@@ -1 +1 @@
-MD5 (phex_0.7.3_j2se1.3.zip) = e4f789619405dd4f9904c0e71fda4aaf
+MD5 (phex_0.8.0.34_j2se1.3.zip) = 416ea3019571f891ef252bb09abf8f45
diff --git a/net/phex/pkg-plist b/net/phex/pkg-plist
index 2f4a12624b08..c0a2b8ddc841 100644
--- a/net/phex/pkg-plist
+++ b/net/phex/pkg-plist
@@ -1,17 +1,12 @@
 bin/phex
-%%PORTDOCS%%share/doc/phex/COPYING
-%%PORTDOCS%%share/doc/phex/GPL.txt
-%%PORTDOCS%%share/doc/phex/License-RI.html
-%%PORTDOCS%%share/doc/phex/License-W3C.html
-%%PORTDOCS%%share/doc/phex/changelog.txt
-%%PORTDOCS%%share/doc/phex/contributors.txt
-%%PORTDOCS%%share/doc/phex/readme-Furi.txt
-%%PORTDOCS%%share/doc/phex/readme-developers.txt
-%%PORTDOCS%%share/doc/phex/readme.txt
-%%JAR_DIR%%/crimson.jar
+%%PORTDOCS%%%%DOCSDIR%%/Phex_other.htm
+%%PORTDOCS%%%%DOCSDIR%%/Phex_win.htm
+%%JAR_DIR%%/crimson-rt.jar
+%%JAR_DIR%%/jaxb-api.jar
+%%JAR_DIR%%/jaxb-libs-rt.jar
+%%JAR_DIR%%/jaxb-ri-rt.jar
 %%JAR_DIR%%/jaxp.jar
 %%JAR_DIR%%/phex.jar
-%%JAR_DIR%%/xalan.jar
 %%PORTDOCS%%@dirrm share/doc/phex
 @dirrm %%JAR_DIR%%
 @unexec rmdir %D/share/java/jar 2>/dev/null || true