4 files changed, 22 insertions, 67 deletions

diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index e3435c77e24f..16988df8f8b1 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -6,72 +6,33 @@
 #
 
 PORTNAME=	phex
-PORTVERSION=	3.2.6.106
+PORTVERSION=	3.4.2.116
 CATEGORIES=	net-p2p java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	A Java multi platform and spyware free gnutella client
 
-#WRKSRC= 	${WRKDIR}/${PORTNAME}/lib
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 NO_BUILD=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR}
-
-JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
-
-DOC_FILES=	Phex_other.htm Phex_win.htm
-JAR_FILES=	\
-		MRJAdapter.jar \
-		commons-collections-3.2.jar \
-		commons-httpclient-3.0.1.jar \
-		commons-logging.jar \
-		forms-1.1.0.jar \
-		looks-2.1.4.jar \
-		phex.jar
-
-PORTDOCS=	${DOC_FILES}
 
-PLIST_FILES+=	bin/${PORTNAME}
+SUB_FILES=	${PORTNAME}.sh
+SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-.for jar in ${JAR_FILES}
-PLIST_FILES+=	%%JAR_DIR%%/${jar}
-.endfor
-
-PLIST_DIRS+=	\
-		%%JAR_DIR%%
-
-post-patch:
-# remove trailing ^M
-	@${REINPLACE_CMD} -E \
-		-e 's!
!!' ${WRKSRC}/docs/readme/*
-	@${SED} -e  "s|%%JAR_DIR%%|${JAR_DIR}|; \
-		s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
-		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
-		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+PORTDOCS=	Phex_other.htm \
+		Undocumented.htm
 
 do-install:
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
-.for jar in ${JAR_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/lib/${jar} ${PREFIX}/${JAR_DIR}
-.endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME}
-.ifndef(NOPORTDOCS)
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/docs/readme/${doc} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/readme/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-JAR_FILE=	${PORTNAME}.jar
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-p2p/phex/distinfo b/net-p2p/phex/distinfo
index cc6e66f7b22b..4590dee4a4b2 100644
--- a/net-p2p/phex/distinfo
+++ b/net-p2p/phex/distinfo
@@ -1,3 +1,3 @@
-MD5 (phex_3.2.6.106.zip) = 58678a7c4f1181f09dc6cfe252ccdf30
-SHA256 (phex_3.2.6.106.zip) = 9df0ad6e9a0e912c1272786e1eb97b17997c8b76fdd8954283be755540ad10c1
-SIZE (phex_3.2.6.106.zip) = 5833853
+MD5 (phex_3.4.2.116.zip) = 526c0720d6c1f5ba6ecc7e8cff45a305
+SHA256 (phex_3.4.2.116.zip) = d22d0436639d464c82ddded9831dba96d2cab3446ee67cd6f8508a64efa2380c
+SIZE (phex_3.4.2.116.zip) = 7989529
diff --git a/net-p2p/phex/files/phex.sh.in b/net-p2p/phex/files/phex.sh.in
new file mode 100644
index 000000000000..70171e64c04d
--- /dev/null
+++ b/net-p2p/phex/files/phex.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export JAVA_VERSION="%%JAVA_VERSION%%"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar phex.jar "${@}"
diff --git a/net-p2p/phex/files/wrapper.sh b/net-p2p/phex/files/wrapper.sh
deleted file mode 100644
index 9f50395b16ae..000000000000
--- a/net-p2p/phex/files/wrapper.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-export JAVA_VERSION
-
-PREFIX="%%PREFIX%%"
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
-JAR_FILE="%%JAR_FILE%%"
-
-${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}"