30 files changed, 197 insertions, 272 deletions

diff --git a/net-p2p/freenet/Makefile b/net-p2p/freenet/Makefile
index bd62830134b4..2b18ef07b873 100644
--- a/net-p2p/freenet/Makefile
+++ b/net-p2p/freenet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freenet
 PORTVERSION=	0.5.2.1.5100
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java security
 MASTER_SITES=	http://freenetproject.org/snapshots/
 DISTNAME=	${PORTNAME}-20041209
@@ -16,14 +16,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Peer-to-peer network aiming at anonymity and freedom of speech
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}
 #
 DATA_FILES=	seednodes.ref
 DOC_FILES=	README
@@ -35,12 +33,19 @@ SEED_FILE=	seednodes.ref
 
 PORTDOCS=	${DOC_FILES}
 
+PLIST_FILES=	\
+		bin/${PORTNAME:L} \
+		%%DATADIR%%/seednodes.ref \
+		%%JAVAJARDIR%%/freenet-ext.jar \
+		%%JAVAJARDIR%%/freenet.jar
+PLIST_DIRS=	%%DATADIR%%
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
 		s|%%DATA_DIR%%|${DATADIR:S,^${PREFIX}/,,}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
-		s|%%JAR_DIR%%|${JAR_DIR}|; \
+		s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \
 		s|%%JAR_FILES%%|${JAR_FILES}|; \
 		s|%%JAR_START%%|${JAR_START}|; \
 		s|%%SEED_FILE%%|${SEED_FILE}|" \
@@ -60,9 +65,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 # jar
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
 .for jar in ${JAR_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${jar} ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/${jar} ${JAVAJARDIR}
 .endfor
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
diff --git a/net-p2p/freenet/files/wrapper.sh b/net-p2p/freenet/files/wrapper.sh
index 8d57ff0b023a..4c6a41452484 100644
--- a/net-p2p/freenet/files/wrapper.sh
+++ b/net-p2p/freenet/files/wrapper.sh
@@ -9,7 +9,7 @@ PREFIX="%%PREFIX%%"
 # java
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM_CALL="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
+JAVAJARDIR="%%JAVAJARDIR%%"
 JAR_FILES="%%JAR_FILES%%"
 JAR_START="%%JAR_START%%"
 # data
@@ -84,10 +84,7 @@ prepare_home_dir () {
   # link the jar files
   for jar in ${JAR_FILES}
   do
-	if [ ! -h ${HOME_DIR}/${jar} ]
-	then
-		ln -sf ${PREFIX}/${JAR_DIR}/${jar} ${HOME_DIR}/${jar}
-	fi
+	ln -sf ${PREFIX}/${JAVAJARDIR}/${jar} ${HOME_DIR}/${jar}
   done
 }
 
diff --git a/net-p2p/freenet/pkg-plist b/net-p2p/freenet/pkg-plist
deleted file mode 100644
index 8b19427a3989..000000000000
--- a/net-p2p/freenet/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/freenet
-share/freenet/seednodes.ref
-share/java/jar/freenet/freenet-ext.jar
-share/java/jar/freenet/freenet.jar
-@dirrm share/java/jar/freenet
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
-@dirrm share/freenet
diff --git a/net-p2p/freenet05/Makefile b/net-p2p/freenet05/Makefile
index bd62830134b4..2b18ef07b873 100644
--- a/net-p2p/freenet05/Makefile
+++ b/net-p2p/freenet05/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freenet
 PORTVERSION=	0.5.2.1.5100
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java security
 MASTER_SITES=	http://freenetproject.org/snapshots/
 DISTNAME=	${PORTNAME}-20041209
@@ -16,14 +16,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Peer-to-peer network aiming at anonymity and freedom of speech
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}
 #
 DATA_FILES=	seednodes.ref
 DOC_FILES=	README
@@ -35,12 +33,19 @@ SEED_FILE=	seednodes.ref
 
 PORTDOCS=	${DOC_FILES}
 
+PLIST_FILES=	\
+		bin/${PORTNAME:L} \
+		%%DATADIR%%/seednodes.ref \
+		%%JAVAJARDIR%%/freenet-ext.jar \
+		%%JAVAJARDIR%%/freenet.jar
+PLIST_DIRS=	%%DATADIR%%
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
 		s|%%DATA_DIR%%|${DATADIR:S,^${PREFIX}/,,}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
-		s|%%JAR_DIR%%|${JAR_DIR}|; \
+		s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \
 		s|%%JAR_FILES%%|${JAR_FILES}|; \
 		s|%%JAR_START%%|${JAR_START}|; \
 		s|%%SEED_FILE%%|${SEED_FILE}|" \
@@ -60,9 +65,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 # jar
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
 .for jar in ${JAR_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${jar} ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/${jar} ${JAVAJARDIR}
 .endfor
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
diff --git a/net-p2p/freenet05/files/wrapper.sh b/net-p2p/freenet05/files/wrapper.sh
index 8d57ff0b023a..4c6a41452484 100644
--- a/net-p2p/freenet05/files/wrapper.sh
+++ b/net-p2p/freenet05/files/wrapper.sh
@@ -9,7 +9,7 @@ PREFIX="%%PREFIX%%"
 # java
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM_CALL="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
+JAVAJARDIR="%%JAVAJARDIR%%"
 JAR_FILES="%%JAR_FILES%%"
 JAR_START="%%JAR_START%%"
 # data
@@ -84,10 +84,7 @@ prepare_home_dir () {
   # link the jar files
   for jar in ${JAR_FILES}
   do
-	if [ ! -h ${HOME_DIR}/${jar} ]
-	then
-		ln -sf ${PREFIX}/${JAR_DIR}/${jar} ${HOME_DIR}/${jar}
-	fi
+	ln -sf ${PREFIX}/${JAVAJARDIR}/${jar} ${HOME_DIR}/${jar}
   done
 }
 
diff --git a/net-p2p/freenet05/pkg-plist b/net-p2p/freenet05/pkg-plist
deleted file mode 100644
index 8b19427a3989..000000000000
--- a/net-p2p/freenet05/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/freenet
-share/freenet/seednodes.ref
-share/java/jar/freenet/freenet-ext.jar
-share/java/jar/freenet/freenet.jar
-@dirrm share/java/jar/freenet
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
-@dirrm share/freenet
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index 310b4bc03dcc..60602346b437 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	frost
 PORTVERSION=	1.2.0.20040225
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -16,19 +17,20 @@ DISTNAME=	${PORTNAME}-25-Feb-2004
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	File-sharing tool for FreeNet with Usenet like forum support
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 USE_ZIP=	yes
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 #WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_WRKSUBDIR=	yes
 PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 VERSION_DATE=	090603
 
 JAVAVM=		${LOCALBASE}/bin/java
-SHARE_DIR=	share/${PORTNAME}
-JAR_DIR=	share/java/jar/${PORTNAME}
+JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
 JAR_FILE=	frost.jar
 JAR_FILES=	frost.jar lib/fecImpl.jar \
 		lib/BCastle.jar \
@@ -41,17 +43,32 @@ JAR_FILES=	frost.jar lib/fecImpl.jar \
 DOC_FILES=	doc/Frost.tex doc/authors.txt doc/gpl.txt \
 		doc/SkinLFLicense.txt \
 		help/faq.txt help/history.txt
+PORTDOCS=	${DOC_FILES:C,^.*/,,}
 
-SHARE_FILES=	config/boards.xml.default \
+DATA_FILES=	config/boards.xml.default \
 		themes/themepack.zip
 
+PLIST_FILES=	bin/${PORTNAME}
+
+.for jar in ${JAR_FILES:C,^.*/,,}
+PLIST_FILES+=	%%JAR_DIR%%/${jar}
+.endfor
+
+.for file in ${DATA_FILES:C,^.*/,,}
+PLIST_FILES+=	%%DATADIR%%/${file}
+.endfor
+
+PLIST_DIR+=	\
+		%%JAR_DIR%% \
+		%%DATADIR%%
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
 		s|%%JAR_DIR%%|${JAR_DIR}|; \
 		s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%SHARE_DIR%%|${SHARE_DIR}|" \
+		s|%%DATADIR%%|${DATADIR:S,^${PREFIX}/,,}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 do-install:
@@ -68,9 +85,9 @@ do-install:
 	@${INSTALL_DATA} ${WRKDIR}/${jar} ${PREFIX}/${JAR_DIR}
 .endfor
 # default boards
-	@${MKDIR} ${PREFIX}/${SHARE_DIR}
-.for file in ${SHARE_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${SHARE_DIR}
+	@${MKDIR} ${DATADIR}
+.for file in ${DATA_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
diff --git a/net-p2p/frost/files/wrapper.sh b/net-p2p/frost/files/wrapper.sh
index b65c91b447e6..f6e7bd2044af 100644
--- a/net-p2p/frost/files/wrapper.sh
+++ b/net-p2p/frost/files/wrapper.sh
@@ -7,7 +7,7 @@ JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILE="%%JAR_FILE%%"
-SHARE_DIR="%%SHARE_DIR%%"
+DATADIR="%%DATADIR%%"
 HOME_DIR=${HOME}/.frost
 CLASSPATH="${PREFIX}/${JAR_DIR}/BCastle.jar:${PREFIX}/${JAR_DIR}/fecImpl.jar:${PREFIX}/${JAR_DIR}/frost.jar:${PREFIX}/${JAR_DIR}/genChkImpl.jar:${PREFIX}/${JAR_DIR}/jocache.jar:${PREFIX}/${JAR_DIR}/mailapi.jar:${PREFIX}/${JAR_DIR}/skinlf.jar:${PREFIX}/${JAR_DIR}/skinlfFix.jar:${PREFIX}/${JAR_DIR}/smtp.jar:${PREFIX}/${JAR_DIR}/xercesImpl.jar:${PREFIX}/${JAR_DIR}/xml-apis.jar:$CLASSPATH"
 
@@ -16,20 +16,15 @@ then
 	mkdir -p ${HOME_DIR}/config
 fi
 
-if [ ! -e ${HOME_DIR}/config/boards.xml.default ]
-then
-	cp ${PREFIX}/${SHARE_DIR}/boards.xml.default ${HOME_DIR}/config/
-fi
+ln -sf ${PREFIX}/${DATADIR}/boards.xml.default \
+	${HOME_DIR}/config/boards.xml.default
 
 if [ ! -d ${HOME_DIR}/themes ]
 then
 	mkdir -p ${HOME_DIR}/themes
 fi
 
-if [ ! -e ${HOME_DIR}/themes/themepack.zip ]
-then
-	cp ${PREFIX}/${SHARE_DIR}/themepack.zip ${HOME_DIR}/themes/
-fi
+ln -sf ${PREFIX}/${DATADIR}/themepack.zip ${HOME_DIR}/themes/themepack.zip
 
 cd ${HOME_DIR} &&
 	exec ${JAVAVM} -cp $CLASSPATH frost.frost "${@}"
diff --git a/net-p2p/frost/pkg-plist b/net-p2p/frost/pkg-plist
deleted file mode 100644
index 13eac6753203..000000000000
--- a/net-p2p/frost/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-bin/frost
-%%JAR_DIR%%/BCastle.jar
-%%JAR_DIR%%/fecImpl.jar
-%%JAR_DIR%%/frost.jar
-%%JAR_DIR%%/genChkImpl.jar
-%%JAR_DIR%%/jocache.jar
-%%JAR_DIR%%/mailapi.jar
-%%JAR_DIR%%/skinlf.jar
-%%JAR_DIR%%/skinlfFix.jar
-%%JAR_DIR%%/smtp.jar
-%%JAR_DIR%%/xercesImpl.jar
-%%JAR_DIR%%/xml-apis.jar
-%%DATADIR%%/boards.xml.default
-%%DATADIR%%/themepack.zip
-%%PORTDOCS%%%%DOCSDIR%%/Frost.tex
-%%PORTDOCS%%%%DOCSDIR%%/SkinLFLicense.txt
-%%PORTDOCS%%%%DOCSDIR%%/authors.txt
-%%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/history.txt
-@dirrm %%JAR_DIR%%
-@dirrm %%DATADIR%%
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index 29d8d9b64782..43b71b9f80a3 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phex
 PORTVERSION=	2.0.0.76
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,17 +16,15 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java multi platform and spyware free gnutella client
 
-USE_JAVA=	1.4+
-USE_PERL5_BUILD=yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+USE_REINPLACE=	yes
 USE_ZIP=	yes
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR} \
-		JAR_FILE=${JAR_FILE}
+PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}/
-JAR_MANIFEST=	${FILESDIR}/manifest
+JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
 
 DOC_FILES=	Phex_other.htm Phex_win.htm
 JAR_FILES=	crimson-rt.jar jaxb-api.jar jaxb-libs-rt.jar \
@@ -33,11 +32,21 @@ JAR_FILES=	crimson-rt.jar jaxb-api.jar jaxb-libs-rt.jar \
 		looks-1.2.2.jar \
 		jaxb-ri-rt.jar jaxp.jar phex.jar
 
+PORTDOCS=	${DOC_FILES}
+
+PLIST_FILES+=	bin/${PORTNAME}
+
+.for jar in ${JAR_FILES}
+PLIST_FILES+=	%%JAR_DIR%%/${jar}
+.endfor
+
 post-patch:
 # remove trailing ^M
-	@${PERL} -pi -ne 's!\r\n!\n!' ${WRKSRC}/docs/readme/*
-	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+	@${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
 
diff --git a/net-p2p/phex/pkg-plist b/net-p2p/phex/pkg-plist
deleted file mode 100644
index 56e7445b99bf..000000000000
--- a/net-p2p/phex/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/phex
-%%PORTDOCS%%%%DOCSDIR%%/Phex_other.htm
-%%PORTDOCS%%%%DOCSDIR%%/Phex_win.htm
-%%JAR_DIR%%/crimson-rt.jar
-%%JAR_DIR%%/forms-1.0.4.jar
-%%JAR_DIR%%/jaxb-api.jar
-%%JAR_DIR%%/jaxb-libs-rt.jar
-%%JAR_DIR%%/jaxb-ri-rt.jar
-%%JAR_DIR%%/jaxp.jar
-%%JAR_DIR%%/looks-1.2.2.jar
-%%JAR_DIR%%/phex.jar
-%%PORTDOCS%%@dirrm share/doc/phex
-@dirrm %%JAR_DIR%%
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile
index dc0aeffa6379..8911c117aee8 100644
--- a/net-p2p/xnap/Makefile
+++ b/net-p2p/xnap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XNap
 DISTVERSION=	2.5r3
+PORTREVISION=	1
 CATEGORIES=	net audio java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -16,26 +17,30 @@ DISTNAME=	${PORTNAME:L}-${DISTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A pure java napster client; also, supports OpenNap & giFT (FastTrack)
 
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}
 
 DOC_FILES=	AUTHORS COPYING COPYING.LIB NEWS README \
 		TODO
+PORTDOCS=	${DOC_FILES}
+
+PLIST_FILES=	\
+		bin/${PORTNAME:L} \
+		%%JAVAJARDIR%%/${PORTNAME:L}.jar
 
 post-patch:
-	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAVAVM%%|${JAVAVM}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+	@${SED} -e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \
+		s|%%JAVAVM%%|${JAVAVM}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 do-install:
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/xnap.jar ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/xnap.jar \
+		${JAVAJARDIR}/${PORTNAME:L}.jar
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/net-p2p/xnap/files/wrapper.sh b/net-p2p/xnap/files/wrapper.sh
index da6e675fd28e..a8d835778df8 100644
--- a/net-p2p/xnap/files/wrapper.sh
+++ b/net-p2p/xnap/files/wrapper.sh
@@ -5,7 +5,7 @@ export JAVA_VERSION
 PREFIX="%%PREFIX%%"
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
+JAVAJARDIR="%%JAVAJARDIR%%"
 JAR_FILE=xnap.jar
 
-${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}"
+${JAVAVM} -jar ${PREFIX}/${JAVAJARDIR}/${JAR_FILE} "${@}"
diff --git a/net-p2p/xnap/pkg-plist b/net-p2p/xnap/pkg-plist
index 8ab19056999e..e69de29bb2d1 100644
--- a/net-p2p/xnap/pkg-plist
+++ b/net-p2p/xnap/pkg-plist
@@ -1,11 +0,0 @@
-bin/xnap
-%%PORTDOCS%%share/doc/XNap/AUTHORS
-%%PORTDOCS%%share/doc/XNap/COPYING
-%%PORTDOCS%%share/doc/XNap/COPYING.LIB
-%%PORTDOCS%%share/doc/XNap/NEWS
-%%PORTDOCS%%share/doc/XNap/README
-%%PORTDOCS%%share/doc/XNap/TODO
-%%JAR_DIR%%/xnap.jar
-@dirrm %%JAR_DIR%%
-%%PORTDOCS%%@dirrm share/doc/XNap
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
diff --git a/net/edonkey-gui-java/Makefile b/net/edonkey-gui-java/Makefile
index 30b02bfa4b3e..a28adc59193d 100644
--- a/net/edonkey-gui-java/Makefile
+++ b/net/edonkey-gui-java/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	edonkey
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net java
 MASTER_SITES=	http://www.edonkey2000.com/files/
 PKGNAMESUFFIX=	-gui-java
@@ -20,25 +20,26 @@ COMMENT=	Java GUI to eDonkey2000 'core' command line client
 
 RUN_DEPENDS=	donkey:${PORTSDIR}/net/linux-edonkey-core
 
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR} \
-		JAR_FILE=${JAR_FILE} \
-		WRAPPER=${PORTNAME}${PKGNAMESUFFIX}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}
+
+PLIST_FILES=	\
+		bin/${PORTNAME}${PKGNAMESUFFIX} \
+		%%JAVAJARDIR%%/${PORTNAME}${PKGNAMESUFFIX}.jar
 
 post-patch:
-	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+	@${SED} -e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \
+		s|%%JAR_FILE%%|${PORTNAME}${PKGNAMESUFFIX}.jar|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 do-install:
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
-	@${INSTALL_DATA} ${DISTDIR}/${JAR_FILE} ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${DISTDIR}/${JAR_FILE} \
+		${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.pre.mk>
diff --git a/net/edonkey-gui-java/files/wrapper.sh b/net/edonkey-gui-java/files/wrapper.sh
index 9f50395b16ae..25ab673cce3e 100644
--- a/net/edonkey-gui-java/files/wrapper.sh
+++ b/net/edonkey-gui-java/files/wrapper.sh
@@ -5,7 +5,7 @@ export JAVA_VERSION
 PREFIX="%%PREFIX%%"
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
+JAVAJARDIR="%%JAVAJARDIR%%"
 JAR_FILE="%%JAR_FILE%%"
 
-${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}"
+${JAVAVM} -jar ${PREFIX}/${JAVAJARDIR}/${JAR_FILE} "${@}"
diff --git a/net/edonkey-gui-java/pkg-plist b/net/edonkey-gui-java/pkg-plist
deleted file mode 100644
index 56dd8a2dfa18..000000000000
--- a/net/edonkey-gui-java/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/%%WRAPPER%%
-%%JAR_DIR%%/%%JAR_FILE%%
-@dirrm %%JAR_DIR%%
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
diff --git a/net/freenet/Makefile b/net/freenet/Makefile
index bd62830134b4..2b18ef07b873 100644
--- a/net/freenet/Makefile
+++ b/net/freenet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freenet
 PORTVERSION=	0.5.2.1.5100
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java security
 MASTER_SITES=	http://freenetproject.org/snapshots/
 DISTNAME=	${PORTNAME}-20041209
@@ -16,14 +16,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Peer-to-peer network aiming at anonymity and freedom of speech
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}
 #
 DATA_FILES=	seednodes.ref
 DOC_FILES=	README
@@ -35,12 +33,19 @@ SEED_FILE=	seednodes.ref
 
 PORTDOCS=	${DOC_FILES}
 
+PLIST_FILES=	\
+		bin/${PORTNAME:L} \
+		%%DATADIR%%/seednodes.ref \
+		%%JAVAJARDIR%%/freenet-ext.jar \
+		%%JAVAJARDIR%%/freenet.jar
+PLIST_DIRS=	%%DATADIR%%
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
 		s|%%DATA_DIR%%|${DATADIR:S,^${PREFIX}/,,}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
-		s|%%JAR_DIR%%|${JAR_DIR}|; \
+		s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \
 		s|%%JAR_FILES%%|${JAR_FILES}|; \
 		s|%%JAR_START%%|${JAR_START}|; \
 		s|%%SEED_FILE%%|${SEED_FILE}|" \
@@ -60,9 +65,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 # jar
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
 .for jar in ${JAR_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${jar} ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/${jar} ${JAVAJARDIR}
 .endfor
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
diff --git a/net/freenet/files/wrapper.sh b/net/freenet/files/wrapper.sh
index 8d57ff0b023a..4c6a41452484 100644
--- a/net/freenet/files/wrapper.sh
+++ b/net/freenet/files/wrapper.sh
@@ -9,7 +9,7 @@ PREFIX="%%PREFIX%%"
 # java
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM_CALL="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
+JAVAJARDIR="%%JAVAJARDIR%%"
 JAR_FILES="%%JAR_FILES%%"
 JAR_START="%%JAR_START%%"
 # data
@@ -84,10 +84,7 @@ prepare_home_dir () {
   # link the jar files
   for jar in ${JAR_FILES}
   do
-	if [ ! -h ${HOME_DIR}/${jar} ]
-	then
-		ln -sf ${PREFIX}/${JAR_DIR}/${jar} ${HOME_DIR}/${jar}
-	fi
+	ln -sf ${PREFIX}/${JAVAJARDIR}/${jar} ${HOME_DIR}/${jar}
   done
 }
 
diff --git a/net/freenet/pkg-plist b/net/freenet/pkg-plist
deleted file mode 100644
index 8b19427a3989..000000000000
--- a/net/freenet/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/freenet
-share/freenet/seednodes.ref
-share/java/jar/freenet/freenet-ext.jar
-share/java/jar/freenet/freenet.jar
-@dirrm share/java/jar/freenet
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
-@dirrm share/freenet
diff --git a/net/frost/Makefile b/net/frost/Makefile
index 310b4bc03dcc..60602346b437 100644
--- a/net/frost/Makefile
+++ b/net/frost/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	frost
 PORTVERSION=	1.2.0.20040225
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -16,19 +17,20 @@ DISTNAME=	${PORTNAME}-25-Feb-2004
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	File-sharing tool for FreeNet with Usenet like forum support
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 USE_ZIP=	yes
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 #WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_WRKSUBDIR=	yes
 PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 VERSION_DATE=	090603
 
 JAVAVM=		${LOCALBASE}/bin/java
-SHARE_DIR=	share/${PORTNAME}
-JAR_DIR=	share/java/jar/${PORTNAME}
+JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
 JAR_FILE=	frost.jar
 JAR_FILES=	frost.jar lib/fecImpl.jar \
 		lib/BCastle.jar \
@@ -41,17 +43,32 @@ JAR_FILES=	frost.jar lib/fecImpl.jar \
 DOC_FILES=	doc/Frost.tex doc/authors.txt doc/gpl.txt \
 		doc/SkinLFLicense.txt \
 		help/faq.txt help/history.txt
+PORTDOCS=	${DOC_FILES:C,^.*/,,}
 
-SHARE_FILES=	config/boards.xml.default \
+DATA_FILES=	config/boards.xml.default \
 		themes/themepack.zip
 
+PLIST_FILES=	bin/${PORTNAME}
+
+.for jar in ${JAR_FILES:C,^.*/,,}
+PLIST_FILES+=	%%JAR_DIR%%/${jar}
+.endfor
+
+.for file in ${DATA_FILES:C,^.*/,,}
+PLIST_FILES+=	%%DATADIR%%/${file}
+.endfor
+
+PLIST_DIR+=	\
+		%%JAR_DIR%% \
+		%%DATADIR%%
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
 		s|%%JAR_DIR%%|${JAR_DIR}|; \
 		s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%SHARE_DIR%%|${SHARE_DIR}|" \
+		s|%%DATADIR%%|${DATADIR:S,^${PREFIX}/,,}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 do-install:
@@ -68,9 +85,9 @@ do-install:
 	@${INSTALL_DATA} ${WRKDIR}/${jar} ${PREFIX}/${JAR_DIR}
 .endfor
 # default boards
-	@${MKDIR} ${PREFIX}/${SHARE_DIR}
-.for file in ${SHARE_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${SHARE_DIR}
+	@${MKDIR} ${DATADIR}
+.for file in ${DATA_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
diff --git a/net/frost/files/wrapper.sh b/net/frost/files/wrapper.sh
index b65c91b447e6..f6e7bd2044af 100644
--- a/net/frost/files/wrapper.sh
+++ b/net/frost/files/wrapper.sh
@@ -7,7 +7,7 @@ JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILE="%%JAR_FILE%%"
-SHARE_DIR="%%SHARE_DIR%%"
+DATADIR="%%DATADIR%%"
 HOME_DIR=${HOME}/.frost
 CLASSPATH="${PREFIX}/${JAR_DIR}/BCastle.jar:${PREFIX}/${JAR_DIR}/fecImpl.jar:${PREFIX}/${JAR_DIR}/frost.jar:${PREFIX}/${JAR_DIR}/genChkImpl.jar:${PREFIX}/${JAR_DIR}/jocache.jar:${PREFIX}/${JAR_DIR}/mailapi.jar:${PREFIX}/${JAR_DIR}/skinlf.jar:${PREFIX}/${JAR_DIR}/skinlfFix.jar:${PREFIX}/${JAR_DIR}/smtp.jar:${PREFIX}/${JAR_DIR}/xercesImpl.jar:${PREFIX}/${JAR_DIR}/xml-apis.jar:$CLASSPATH"
 
@@ -16,20 +16,15 @@ then
 	mkdir -p ${HOME_DIR}/config
 fi
 
-if [ ! -e ${HOME_DIR}/config/boards.xml.default ]
-then
-	cp ${PREFIX}/${SHARE_DIR}/boards.xml.default ${HOME_DIR}/config/
-fi
+ln -sf ${PREFIX}/${DATADIR}/boards.xml.default \
+	${HOME_DIR}/config/boards.xml.default
 
 if [ ! -d ${HOME_DIR}/themes ]
 then
 	mkdir -p ${HOME_DIR}/themes
 fi
 
-if [ ! -e ${HOME_DIR}/themes/themepack.zip ]
-then
-	cp ${PREFIX}/${SHARE_DIR}/themepack.zip ${HOME_DIR}/themes/
-fi
+ln -sf ${PREFIX}/${DATADIR}/themepack.zip ${HOME_DIR}/themes/themepack.zip
 
 cd ${HOME_DIR} &&
 	exec ${JAVAVM} -cp $CLASSPATH frost.frost "${@}"
diff --git a/net/frost/pkg-plist b/net/frost/pkg-plist
deleted file mode 100644
index 13eac6753203..000000000000
--- a/net/frost/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-bin/frost
-%%JAR_DIR%%/BCastle.jar
-%%JAR_DIR%%/fecImpl.jar
-%%JAR_DIR%%/frost.jar
-%%JAR_DIR%%/genChkImpl.jar
-%%JAR_DIR%%/jocache.jar
-%%JAR_DIR%%/mailapi.jar
-%%JAR_DIR%%/skinlf.jar
-%%JAR_DIR%%/skinlfFix.jar
-%%JAR_DIR%%/smtp.jar
-%%JAR_DIR%%/xercesImpl.jar
-%%JAR_DIR%%/xml-apis.jar
-%%DATADIR%%/boards.xml.default
-%%DATADIR%%/themepack.zip
-%%PORTDOCS%%%%DOCSDIR%%/Frost.tex
-%%PORTDOCS%%%%DOCSDIR%%/SkinLFLicense.txt
-%%PORTDOCS%%%%DOCSDIR%%/authors.txt
-%%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/history.txt
-@dirrm %%JAR_DIR%%
-@dirrm %%DATADIR%%
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/jsch/Makefile b/net/jsch/Makefile
index a9bb2ba1ca52..0f8d04e90881 100644
--- a/net/jsch/Makefile
+++ b/net/jsch/Makefile
@@ -7,30 +7,25 @@
 
 PORTNAME=	jsch
 PORTVERSION=	0.1.18
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A pure Java implementation of SSH2
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-
-JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}/
 
 JAR_FILE=	${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
-PLIST_FILES+=	${JAR_DIR}/${DISTNAME}${EXTRACT_SUFX}
-PLIST_DIRS+=	${JAR_DIR}
+PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 do-install:
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
-	@${INSTALL_DATA} ${JAR_FILE} ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${JAR_FILE} ${JAVAJARDIR}/${PORTNAME}.jar
 
 .include <bsd.port.mk>
diff --git a/net/phex/Makefile b/net/phex/Makefile
index 29d8d9b64782..43b71b9f80a3 100644
--- a/net/phex/Makefile
+++ b/net/phex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phex
 PORTVERSION=	2.0.0.76
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,17 +16,15 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A Java multi platform and spyware free gnutella client
 
-USE_JAVA=	1.4+
-USE_PERL5_BUILD=yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+USE_REINPLACE=	yes
 USE_ZIP=	yes
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR} \
-		JAR_FILE=${JAR_FILE}
+PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}/
-JAR_MANIFEST=	${FILESDIR}/manifest
+JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
 
 DOC_FILES=	Phex_other.htm Phex_win.htm
 JAR_FILES=	crimson-rt.jar jaxb-api.jar jaxb-libs-rt.jar \
@@ -33,11 +32,21 @@ JAR_FILES=	crimson-rt.jar jaxb-api.jar jaxb-libs-rt.jar \
 		looks-1.2.2.jar \
 		jaxb-ri-rt.jar jaxp.jar phex.jar
 
+PORTDOCS=	${DOC_FILES}
+
+PLIST_FILES+=	bin/${PORTNAME}
+
+.for jar in ${JAR_FILES}
+PLIST_FILES+=	%%JAR_DIR%%/${jar}
+.endfor
+
 post-patch:
 # remove trailing ^M
-	@${PERL} -pi -ne 's!\r\n!\n!' ${WRKSRC}/docs/readme/*
-	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+	@${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
 
diff --git a/net/phex/pkg-plist b/net/phex/pkg-plist
deleted file mode 100644
index 56e7445b99bf..000000000000
--- a/net/phex/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/phex
-%%PORTDOCS%%%%DOCSDIR%%/Phex_other.htm
-%%PORTDOCS%%%%DOCSDIR%%/Phex_win.htm
-%%JAR_DIR%%/crimson-rt.jar
-%%JAR_DIR%%/forms-1.0.4.jar
-%%JAR_DIR%%/jaxb-api.jar
-%%JAR_DIR%%/jaxb-libs-rt.jar
-%%JAR_DIR%%/jaxb-ri-rt.jar
-%%JAR_DIR%%/jaxp.jar
-%%JAR_DIR%%/looks-1.2.2.jar
-%%JAR_DIR%%/phex.jar
-%%PORTDOCS%%@dirrm share/doc/phex
-@dirrm %%JAR_DIR%%
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
diff --git a/net/xnap/Makefile b/net/xnap/Makefile
index dc0aeffa6379..8911c117aee8 100644
--- a/net/xnap/Makefile
+++ b/net/xnap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XNap
 DISTVERSION=	2.5r3
+PORTREVISION=	1
 CATEGORIES=	net audio java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -16,26 +17,30 @@ DISTNAME=	${PORTNAME:L}-${DISTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A pure java napster client; also, supports OpenNap & giFT (FastTrack)
 
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
-PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/java
-JAR_DIR=	share/java/jar/${PORTNAME}
 
 DOC_FILES=	AUTHORS COPYING COPYING.LIB NEWS README \
 		TODO
+PORTDOCS=	${DOC_FILES}
+
+PLIST_FILES=	\
+		bin/${PORTNAME:L} \
+		%%JAVAJARDIR%%/${PORTNAME:L}.jar
 
 post-patch:
-	@${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAVAVM%%|${JAVAVM}|; \
-		s|%%JAVA_VERSION%%|${USE_JAVA}|; \
+	@${SED} -e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \
+		s|%%JAVAVM%%|${JAVAVM}|; \
+		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
 do-install:
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/xnap.jar ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/xnap.jar \
+		${JAVAJARDIR}/${PORTNAME:L}.jar
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/net/xnap/files/wrapper.sh b/net/xnap/files/wrapper.sh
index da6e675fd28e..a8d835778df8 100644
--- a/net/xnap/files/wrapper.sh
+++ b/net/xnap/files/wrapper.sh
@@ -5,7 +5,7 @@ export JAVA_VERSION
 PREFIX="%%PREFIX%%"
 JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
+JAVAJARDIR="%%JAVAJARDIR%%"
 JAR_FILE=xnap.jar
 
-${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}"
+${JAVAVM} -jar ${PREFIX}/${JAVAJARDIR}/${JAR_FILE} "${@}"
diff --git a/net/xnap/pkg-plist b/net/xnap/pkg-plist
index 8ab19056999e..e69de29bb2d1 100644
--- a/net/xnap/pkg-plist
+++ b/net/xnap/pkg-plist
@@ -1,11 +0,0 @@
-bin/xnap
-%%PORTDOCS%%share/doc/XNap/AUTHORS
-%%PORTDOCS%%share/doc/XNap/COPYING
-%%PORTDOCS%%share/doc/XNap/COPYING.LIB
-%%PORTDOCS%%share/doc/XNap/NEWS
-%%PORTDOCS%%share/doc/XNap/README
-%%PORTDOCS%%share/doc/XNap/TODO
-%%JAR_DIR%%/xnap.jar
-@dirrm %%JAR_DIR%%
-%%PORTDOCS%%@dirrm share/doc/XNap
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
diff --git a/security/gnu-crypto/Makefile b/security/gnu-crypto/Makefile
index f73882177c4c..b802e8258f1f 100644
--- a/security/gnu-crypto/Makefile
+++ b/security/gnu-crypto/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnu-crypto
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	security java
 MASTER_SITES=   ${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,7 +30,6 @@ USE_JAVA=       yes
 JAVA_VERSION=   1.4+
 USE_ANT=	yes
 
-JAR_DIR=	share/java/jar/${PORTNAME}
 JAR_FILES=	\
 		javax-crypto.jar \
 		javax-security.jar \
@@ -39,11 +39,9 @@ INFO=		gnu-crypto
 MAKEINFOFLAGS=	--no-split
 
 .for jar in ${JAR_FILES}
-PLIST_FILES+=	${JAR_DIR}/${jar}
+PLIST_FILES+=	%%JAVAJARDIR%%/${jar}
 .endfor
 
-PLIST_DIRS+=	${JAR_DIR}
-
 post-extract:
 	@${RM} ${WRKSRC}/docs/*.info*
 
@@ -56,9 +54,8 @@ post-build:
 	@cd ${WRKSRC}/docs && ${GMAKE} all
 
 do-install:
-	@${MKDIR} ${PREFIX}/${JAR_DIR}
 .for jar in ${JAR_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/lib/${jar} ${PREFIX}/${JAR_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/lib/${jar} ${JAVAJARDIR}
 .endfor
 	@${MKDIR} ${PREFIX}/${INFO_PATH}
 	@${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.info \