5 files changed, 26 insertions, 35 deletions

diff --git a/editors/jedit-devel/Makefile b/editors/jedit-devel/Makefile
index 0d756113babf..76031282d6b3 100644
--- a/editors/jedit-devel/Makefile
+++ b/editors/jedit-devel/Makefile
@@ -6,40 +6,39 @@
 #
 
 PORTNAME=	jedit
-PORTVERSION=	4.2.0pre15
+PORTVERSION=	4.3.p1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-_DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}install
-DISTNAME=	${_DISTNAME:S/0pre/pre/}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g:S/p/pre/}install
 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
 
-IGNORE=		marked as IGNORE: editors/jedit is the latest version
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	"${IGNORE}"
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+
+CONFLICTS=	jedit-4.2*
 
-LATEST_LINK=	jedit-devel
 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)
@@ -47,16 +46,9 @@ 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} "******************************************************"
 
 .include <bsd.port.mk>
diff --git a/editors/jedit-devel/distinfo b/editors/jedit-devel/distinfo
index 7384015b45c8..1b3106a87709 100644
--- a/editors/jedit-devel/distinfo
+++ b/editors/jedit-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (jedit42pre15install.jar) = bc91d479864cae0bf0471de13036251b
-SIZE (jedit42pre15install.jar) = 2066422
+MD5 (jedit43pre1install.jar) = 05f6cbe772168e2f2a4452bf43350115
+SIZE (jedit43pre1install.jar) = 2094257
diff --git a/editors/jedit-devel/files/instscript b/editors/jedit-devel/files/instscript
index 52a51decbbb5..535ca886a694 100644
--- a/editors/jedit-devel/files/instscript
+++ b/editors/jedit-devel/files/instscript
@@ -1,4 +1,4 @@
-%%PREFIX%%/share/java/jedit
+%%DATADIR%%
 %%WRKDIR%%
 %%PREFIX%%/man/man1
 Y
diff --git a/editors/jedit-devel/files/jedit.sh b/editors/jedit-devel/files/jedit.sh
deleted file mode 100644
index 997759ad6294..000000000000
--- a/editors/jedit-devel/files/jedit.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/editors/jedit-devel/files/Attic/jedit.sh,v 1.1 2004-06-03 02:35:30 ijliao Exp $
-
-# 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-devel/files/jedit.sh.in b/editors/jedit-devel/files/jedit.sh.in
new file mode 100644
index 000000000000..6b2c3e618483
--- /dev/null
+++ b/editors/jedit-devel/files/jedit.sh.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+# $FreeBSD$
+
+# Java heap size, in megabytes
+JAVA_HEAP_SIZE=32
+
+JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"