- Update to bsd.java.mk 2.0

- Fix dynamic plist creation where all JAVASHAREDIR would be listed (and thus
  removed with the port) (!)
- Use SUB_LIST and tweak the launcher shell script
- Move displayed information into pkg-message
- Use DATADIR=${JAVASHAREDIR}/${PORTNAME}

5 files changed, 30 insertions, 26 deletions

diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 96eb5b090629..b71e7d4f7f8c 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -15,25 +15,28 @@ EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Powerful programmer's text editor written in Java
+COMMENT=	Powerful programmer\'s text editor written in Java
 
-USE_JAVA=	1.3+
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 
 USE_XLIB=	yes
 NO_BUILD=	yes
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+SUB_FILES=	jedit.sh
+
 MAN1=		jedit.1
 # The complete PLIST is generated in post-install
 PLIST_FILES=	bin/jedit
 
-do-configure:
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		${FILESDIR}/jedit.sh > ${WRKDIR}/jedit.sh
-
 do-install:
-	@${SED} "s|%%PREFIX%%|${PREFIX}| ; s|%%WRKDIR%%|${WRKDIR}|" ${FILESDIR}/instscript | \
+	@${SED} "s|%%PREFIX%%|${PREFIX}| ; s|%%DATADIR%%|${DATADIR}| ; s|%%WRKDIR%%|${WRKDIR}|" ${FILESDIR}/instscript | \
 		${SETENV} CLASSPATH=${DISTDIR}/${DISTNAME}.jar \
-		${LOCALBASE}/bin/javavm installer.Install text
+		${JAVA} installer.Install text
 	@${INSTALL_SCRIPT} ${WRKDIR}/jedit.sh ${PREFIX}/bin/jedit
 
 .if defined(PARALLEL_PACKAGE_BUILD)
@@ -41,16 +44,10 @@ IGNORE=	hang
 .endif
 
 post-install:
-	@${FIND} ${JAVASHAREDIR} ! -type d | \
+	@${FIND} ${DATADIR} ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${JAVASHAREDIR} -type d | ${SORT} -r | \
+	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-	@${ECHO_CMD} "******************************************************"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "In order to use the optional SFTP plug-in for jEdit,"
-	@${ECHO_CMD} "you will need to have Java JDK version 1.4 or newer"
-	@${ECHO_CMD} "installed."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "******************************************************"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/editors/jedit/files/instscript b/editors/jedit/files/instscript
index 52a51decbbb5..535ca886a694 100644
--- a/editors/jedit/files/instscript
+++ b/editors/jedit/files/instscript
@@ -1,4 +1,4 @@
-%%PREFIX%%/share/java/jedit
+%%DATADIR%%
 %%WRKDIR%%
 %%PREFIX%%/man/man1
 Y
diff --git a/editors/jedit/files/jedit.sh b/editors/jedit/files/jedit.sh
deleted file mode 100644
index 10a8359c5def..000000000000
--- a/editors/jedit/files/jedit.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# Java heap size, in megabytes
-JAVA_HEAP_SIZE=32
-
-exec %%LOCALBASE%%/bin/javavm -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar \
-	"%%PREFIX%%/share/java/jedit/jedit.jar" "$@"
diff --git a/editors/jedit/files/jedit.sh.in b/editors/jedit/files/jedit.sh.in
new file mode 100644
index 000000000000..7753dcfa5694
--- /dev/null
+++ b/editors/jedit/files/jedit.sh.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+# $FreeBSD$
+
+# Java heap size, in megabytes
+JAVA_HEAP_SIZE=32
+
+JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
diff --git a/editors/jedit/pkg-message b/editors/jedit/pkg-message
new file mode 100644
index 000000000000..6db313b5bd9d
--- /dev/null
+++ b/editors/jedit/pkg-message
@@ -0,0 +1,8 @@
+
+******************************************************
+
+In order to use the optional SFTP plug-in for jEdit,
+you will need to have Java JDK version 1.4 or newer
+installed.
+
+******************************************************