4 files changed, 44 insertions, 47 deletions

diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index 7d0c8c9e396a..b4812f90cdb5 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -6,33 +6,29 @@
 #
 
 PORTNAME=	crossip
-PORTVERSION=	1.2
+DISTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	dns java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
-DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
 
 MAINTAINER=	dan@algenta.com
-COMMENT=	CrossIP is a java DNS update client for the ThatIP protocol
+COMMENT=	Java DNS update client for the ThatIP protocol
 
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 USE_ZIP=	yes
 
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 
-JAVA_VM=	${LOCALBASE}/bin/javavm
-TARGET_DIR=	${JAVASHAREDIR}/${PKGNAME}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-post-patch:
-	@${SED} -e "s|%%JAR_DIR%%|${JAVAJARDIR}|;s|%%JAVAVM%%|${JAVA_VM}|" \
-		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+SUB_FILES=	crossip.sh
 
 do-install:
-	${MKDIR} ${JAVAJARDIR}
-	${MKDIR} ${TARGET_DIR}
-	${CP} -R ${WRKSRC}/* ${TARGET_DIR}
-	${LN} -sf ${TARGET_DIR}/lib/CrossIP.jar ${JAVAJARDIR}/CrossIP.jar
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
+	${MKDIR} ${DATADIR}
+	${CP} -R ${WRKSRC}/* ${DATADIR}
+	${LN} -sf ${DATADIR}/lib/CrossIP.jar ${JAVAJARDIR}/CrossIP.jar
+	@${INSTALL_SCRIPT} ${WRKDIR}/crossip.sh ${PREFIX}/bin/crossip
 
 .include <bsd.port.mk>
diff --git a/dns/crossip/files/crossip.sh.in b/dns/crossip/files/crossip.sh.in
new file mode 100644
index 000000000000..cdac67ef2b31
--- /dev/null
+++ b/dns/crossip/files/crossip.sh.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" \
+	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/lib/CrossIP.jar" "${@}"
diff --git a/dns/crossip/files/wrapper.sh b/dns/crossip/files/wrapper.sh
deleted file mode 100644
index 92cee97d6b7a..000000000000
--- a/dns/crossip/files/wrapper.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
-
-${JAVAVM} -jar ${JAR_DIR}/CrossIP.jar "${@}"
diff --git a/dns/crossip/pkg-plist b/dns/crossip/pkg-plist
index 76320fecf6ca..51cd79745934 100644
--- a/dns/crossip/pkg-plist
+++ b/dns/crossip/pkg-plist
@@ -1,27 +1,28 @@
+@comment $FreeBSD$
 bin/crossip
-share/java/classes/CrossIP.jar
-share/java/crossip-1.2/LICENSE.txt
-share/java/crossip-1.2/README.txt
-share/java/crossip-1.2/bin/com/algenta/crossip/Actions.class
-share/java/crossip-1.2/bin/com/algenta/crossip/Config.class
-share/java/crossip-1.2/bin/com/algenta/crossip/ConfigFileException.class
-share/java/crossip-1.2/bin/com/algenta/crossip/CrossIP.class
-share/java/crossip-1.2/bin/com/algenta/crossip/CrossIPConstants.class
-share/java/crossip-1.2/bin/com/algenta/crossip/CrossIPException.class
-share/java/crossip-1.2/lib/CrossIP.jar
-share/java/crossip-1.2/src/com/algenta/crossip/Actions.java
-share/java/crossip-1.2/src/com/algenta/crossip/Config.java
-share/java/crossip-1.2/src/com/algenta/crossip/ConfigFileException.java
-share/java/crossip-1.2/src/com/algenta/crossip/CrossIP.java
-share/java/crossip-1.2/src/com/algenta/crossip/CrossIPConstants.java
-share/java/crossip-1.2/src/com/algenta/crossip/CrossIPException.java
-@dirrm share/java/crossip-1.2/src/com/algenta/crossip
-@dirrm share/java/crossip-1.2/src/com/algenta
-@dirrm share/java/crossip-1.2/src/com
-@dirrm share/java/crossip-1.2/src
-@dirrm share/java/crossip-1.2/lib
-@dirrm share/java/crossip-1.2/bin/com/algenta/crossip
-@dirrm share/java/crossip-1.2/bin/com/algenta
-@dirrm share/java/crossip-1.2/bin/com
-@dirrm share/java/crossip-1.2/bin
-@dirrm share/java/crossip-1.2
+%%JAVAJARDIR%%/CrossIP.jar
+%%DATADIR%%/LICENSE.txt
+%%DATADIR%%/README.txt
+%%DATADIR%%/bin/com/algenta/crossip/Actions.class
+%%DATADIR%%/bin/com/algenta/crossip/Config.class
+%%DATADIR%%/bin/com/algenta/crossip/ConfigFileException.class
+%%DATADIR%%/bin/com/algenta/crossip/CrossIP.class
+%%DATADIR%%/bin/com/algenta/crossip/CrossIPConstants.class
+%%DATADIR%%/bin/com/algenta/crossip/CrossIPException.class
+%%DATADIR%%/lib/CrossIP.jar
+%%DATADIR%%/src/com/algenta/crossip/Actions.java
+%%DATADIR%%/src/com/algenta/crossip/Config.java
+%%DATADIR%%/src/com/algenta/crossip/ConfigFileException.java
+%%DATADIR%%/src/com/algenta/crossip/CrossIP.java
+%%DATADIR%%/src/com/algenta/crossip/CrossIPConstants.java
+%%DATADIR%%/src/com/algenta/crossip/CrossIPException.java
+@dirrm %%DATADIR%%/src/com/algenta/crossip
+@dirrm %%DATADIR%%/src/com/algenta
+@dirrm %%DATADIR%%/src/com
+@dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/bin/com/algenta/crossip
+@dirrm %%DATADIR%%/bin/com/algenta
+@dirrm %%DATADIR%%/bin/com
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%