From da0cac05ab20de16b27a19b0bce45f6833f4c212 Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Thu, 7 Jul 2005 18:38:19 +0000
Subject: Update to 1.1.2-pre1 released in February 2004. Some serious
REINPLACE-ing was required to turn all variables named `enum' into
`enumeration', because `enum' is a keyword in Java-1.5
The program seems to work now and builds with Java-1.5 (and, presumably,
earlier).
The portversion is set to 1.1.1.1 in anticipation of the eventual
release of 1.1.2 by the vendor.
---
java/jode/Makefile | 20 +++++++++++++-------
java/jode/distinfo | 4 ++--
java/jode/files/patch-bin-jode | 2 +-
3 files changed, 16 insertions(+), 10 deletions(-)
(limited to 'java/jode')
diff --git a/java/jode/Makefile b/java/jode/Makefile
index a9b503f590c4..5efd14861e39 100644
--- a/java/jode/Makefile
+++ b/java/jode/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
PORTNAME= jode
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.1.1
CATEGORIES= java devel
+DISTNAME= ${PORTNAME}-${VENDOR_VERSION}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
@@ -17,10 +17,12 @@ COMMENT= A java package containing a decompiler and an optimizer for java
BUILD_DEPENDS= ${GETOPT_JAR}:${PORTSDIR}/java/java-getopt
RUN_DEPENDS= ${BUILD_DEPENDS}
+VENDOR_VERSION= 1.1.2-pre1
USE_JAVA= 1.2+
NEED_JAVAC= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
GETOPT_JAR= ${JAVAJARDIR}/getopt.jar
CLASSLIB= ${JAVA_CLASSES}:${GETOPT_JAR}
@@ -29,16 +31,20 @@ CONFIGURE_ENV+= CLASSLIB=${CLASSLIB} JAR="${JAR}" \
CONFIGURE_ARGS+=--datadir="${JAVAJARDIR}"
# Don't create the dependencies:
MAKE_ARGS+= JAVADEP=:
-# Run two compilers in parallel -- faster even on a single CPU machine:
-MAKE_ARGS+= -j2
-PLIST_SUB+= VERSION=${PORTVERSION}
+PLIST_SUB+= VERSION=${VENDOR_VERSION}
+
+post-patch:
+ ${FIND} ${WRKSRC} -name '*.java*' | \
+ ${XARGS} ${GREP} --mmap -l 'Enumeration enum ' | \
+ ${XARGS} ${REINPLACE_CMD} -E \
+ -e 's,enum([ \.]),enumeration\1,g'
post-build:
- cd ${WRKSRC} && ${JAR} cvf ${PORTNAME}-${PORTVERSION}.jar \
+ cd ${WRKSRC} && ${JAR} cvf ${PORTNAME}-${VENDOR_VERSION}.jar \
`${FIND} jode -name \*.class`
post-install:
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${VENDOR_VERSION}.jar \
${JAVAJARDIR}/
# Documentation HTML seems broken and out of date. Don't bother
#.ifndef (NOPORTDOCS)
diff --git a/java/jode/distinfo b/java/jode/distinfo
index d71fb8b4b2d9..696f192439c9 100644
--- a/java/jode/distinfo
+++ b/java/jode/distinfo
@@ -1,2 +1,2 @@
-MD5 (jode-1.1.1.tar.gz) = 66e76ed2dd68d6b4a2c05f9af265f749
-SIZE (jode-1.1.1.tar.gz) = 397164
+MD5 (jode-1.1.2-pre1.tar.gz) = 1d0aeda0c4cf0f8216fe46d97012308b
+SIZE (jode-1.1.2-pre1.tar.gz) = 584300
diff --git a/java/jode/files/patch-bin-jode b/java/jode/files/patch-bin-jode
index c77c812475d4..d1354a7bad25 100644
--- a/java/jode/files/patch-bin-jode
+++ b/java/jode/files/patch-bin-jode
@@ -14,5 +14,5 @@
-CP=`echo $CLASSPATH | sed s/:/,/`
-CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \
-@JAVA@ $CLAZZ --classpath $CP $*
-+exec javavm -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
++exec java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
+ $CLAZZ $CP "$@"
--
cgit v1.2.3