- Update to bsd.java.mk 2.0

- Use SUB_FILES for launcher shell script
- Use PLIST_FILES
- Set NO_BUILD
- Enforce the use of a native JDK (in the port and the launcher shell script)
- Fill pkg-descr

5 files changed, 31 insertions, 14 deletions

diff --git a/audio/jxm/Makefile b/audio/jxm/Makefile
index d1907d9fef4a..cd6ce9e44d66 100644
--- a/audio/jxm/Makefile
+++ b/audio/jxm/Makefile
@@ -16,21 +16,24 @@ EXTRACT_SUFX=	.jar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMPCR (USB XM radio) control software
 
-RUN_DEPENDS=	${JDKDIR}/jre/lib/ext/CommDriver.jar:${PORTSDIR}/comms/java-commapi-freebsd
+RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/CommDriver.jar:${PORTSDIR}/comms/java-commapi-freebsd
 
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+JAVA_OS=	native
 
-do-extract:
-	${MKDIR} ${WRKSRC}
+NO_BUILD=	yes
+
+SUB_FILES=	jxm.sh
+PLIST_FILES=	%%JAVAJARDIR%%/jxm.jar bin/jxm
 
-do-build:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		< ${FILESDIR}/jxm > ${WRKSRC}/jxm
+do-extract:
+	${MKDIR} ${WRKDIR}
 
 do-install:
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
-		${PREFIX}/share/java/classes/jxm.jar
-	${INSTALL_SCRIPT} ${WRKSRC}/jxm \
+		${JAVAJARDIR}/jxm.jar
+	${INSTALL_SCRIPT} ${WRKDIR}/jxm.sh \
 		${PREFIX}/bin/jxm
 
 .include <bsd.port.mk>
diff --git a/audio/jxm/files/jxm b/audio/jxm/files/jxm
deleted file mode 100644
index 73a159528415..000000000000
--- a/audio/jxm/files/jxm
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec javavm -jar %%PREFIX%%/share/java/classes/jxm.jar
diff --git a/audio/jxm/files/jxm.sh.in b/audio/jxm/files/jxm.sh.in
new file mode 100644
index 000000000000..3e6bdd9d75c4
--- /dev/null
+++ b/audio/jxm/files/jxm.sh.in
@@ -0,0 +1,5 @@
+#! /bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="1.4+" JAVA_OS="native" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jxm.jar" "$@"
diff --git a/audio/jxm/pkg-descr b/audio/jxm/pkg-descr
index 8f2b59ad8c1f..b9cc8c31a1a1 100644
--- a/audio/jxm/pkg-descr
+++ b/audio/jxm/pkg-descr
@@ -1,2 +1,16 @@
+JXM is a pure-java (SWING) GUI for controlling the XMPCR, which is a USB
+powered and controlled XM radio.
+
+Features:
+  * Fuzzy logic search
+  * Song time remaining
+  * Channel filtering
+  * Memory
+  * Integration with XM's web site
+  * Integration with Google
+  * Integration with iTunes Music Store (where possible)
+  * XM Tracker protocol client
+  * Song rating protocol client
+  * "Smart" mute
 
 WWW: http://javaxm.sourceforge.net/
diff --git a/audio/jxm/pkg-plist b/audio/jxm/pkg-plist
deleted file mode 100644
index de173aaa3c2f..000000000000
--- a/audio/jxm/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-share/java/classes/jxm.jar
-bin/jxm