ports/75770: Update Port: editors/jedit-devel to 4.3pre1

[Linh Pham]

On 2005-01-18 12:36 +0000, Volker Stolz <vs at FreeBSD.org> wrote:

# State-Changed-From-To: open->feedback
# State-Changed-By: vs
# State-Changed-When: Tue Jan 18 12:31:14 GMT 2005
# State-Changed-Why: 
# I can't quit jedit-devel on 4.11: It will freeze when I select Quit
# in the menu. Is this a known problem? If I replace the 'javavm'-
# invocation (which yields the following warning btw:
# "javavm: warning: The use of 'javavm' as a synonym for 'java' is deprecated")
# I can exit, but my pkgdb isn't quite sure where /usr/local/bin/java
# is coming from :/ Maybe the javavm in the shell-script should be
# replaced by the value of ${JAVA}?

I have modified the patched Makefile to use ${JAVA} instead of
${LOCALBASE}/bin/javavm and replaced "javavm" with "java" in the patched
files/jedit.sh.

As far as the freezing problem under 4.11, I just installed 4.11-RC3,
XFree86 4.4.0_1,1, JDK 1.4.2 (latest version, bootstrapped with
linux-sun-jdk14) and jEdit 4.3pre1 and it didn't hang on me while
exiting from the menu. What is the environment that you using where it hangs
on exiting?

Attached is the updated patch against the current editors/jedit-devel.

-- 
Linh Pham                               question+fbsdports at closedsrc.org
Webmaster and FreeBSD Geek                          http://closedsrc.org
Apprentice Manager Editor and Writer           http://www.daemonnews.org
Q->Worf: Eat any good books lately? | Humans = Ugly Bags of Mostly Water
-------------- next part --------------
diff -ruN /usr/ports/editors/jedit-devel/Makefile jedit-devel/Makefile
--- /usr/ports/editors/jedit-devel/Makefile	Sat Dec 18 17:15:42 2004
+++ jedit-devel/Makefile	Tue Jan 18 17:04:14 2005
@@ -5,24 +5,21 @@
 # $FreeBSD: ports/editors/jedit-devel/Makefile,v 1.6 2004/12/18 23:02:24 kris Exp $
 #
 
-PORTNAME=	jedit
-PORTVERSION=	4.2.0pre15
+PORTNAME=	jedit-devel
+PORTVERSION=	4.3pre1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-_DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}install
-DISTNAME=	${_DISTNAME:S/0pre/pre/}
+MASTER_SITE_SUBDIR=	${PORTNAME:S/-devel//g}
+DISTNAME=	${PORTNAME:S/-devel//g}${PORTVERSION:S/.//g}install
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
 MAINTAINER=	ports at FreeBSD.org
 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}"
+CONFLICTS=	jedit-4.*
 
-USE_JAVA=	1.3+
+USE_JAVA=	1.4+
 
 USE_XLIB=	yes
 NO_BUILD=	yes
@@ -38,7 +35,7 @@
 do-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}| ; 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)
@@ -50,12 +47,5 @@
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${JAVASHAREDIR} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/, at 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 -ruN /usr/ports/editors/jedit-devel/distinfo jedit-devel/distinfo
--- /usr/ports/editors/jedit-devel/distinfo	Wed Aug 11 20:23:31 2004
+++ jedit-devel/distinfo	Tue Jan 18 17:01:01 2005
@@ -1,2 +1,2 @@
-MD5 (jedit42pre15install.jar) = bc91d479864cae0bf0471de13036251b
-SIZE (jedit42pre15install.jar) = 2066422
+MD5 (jedit43pre1install.jar) = 05f6cbe772168e2f2a4452bf43350115
+SIZE (jedit43pre1install.jar) = 2094257
diff -ruN /usr/ports/editors/jedit-devel/files/jedit.sh jedit-devel/files/jedit.sh
--- /usr/ports/editors/jedit-devel/files/jedit.sh	Wed Jun  2 19:35:30 2004
+++ jedit-devel/files/jedit.sh	Tue Jan 18 17:01:24 2005
@@ -4,5 +4,5 @@
 # Java heap size, in megabytes
 JAVA_HEAP_SIZE=32
 
-exec %%LOCALBASE%%/bin/javavm -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar \
+exec %%LOCALBASE%%/bin/java -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar \
 	"%%PREFIX%%/share/java/jedit/jedit.jar" "$@"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/attachments/20050118/01c11f12/attachment.sig>