aboutsummaryrefslogtreecommitdiffstats
path: root/java/gj
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2004-08-11 22:56:52 +0800
committervs <vs@FreeBSD.org>2004-08-11 22:56:52 +0800
commitb3af8b8a8d8a207ed82ab16aa0a2ea54417f617b (patch)
tree79290601f1810d9f66706a9c356bf57890318998 /java/gj
parent1c73c1204fd9b7b9285fc2a9297b73270f4dcefd (diff)
downloadfreebsd-ports-gnome-b3af8b8a8d8a207ed82ab16aa0a2ea54417f617b.tar.gz
freebsd-ports-gnome-b3af8b8a8d8a207ed82ab16aa0a2ea54417f617b.tar.zst
freebsd-ports-gnome-b3af8b8a8d8a207ed82ab16aa0a2ea54417f617b.zip
- Use bsd.java.mk-2.0 (reminded by hq@)
- Use PKGNAMESUFFIX - Twiddle PLIST_FILES/pkg-plist to hopefully ease merging
Diffstat (limited to 'java/gj')
-rw-r--r--java/gj/Makefile9
-rw-r--r--java/gj/pkg-plist5
2 files changed, 7 insertions, 7 deletions
diff --git a/java/gj/Makefile b/java/gj/Makefile
index 7f779d08811b..10593ae0043c 100644
--- a/java/gj/Makefile
+++ b/java/gj/Makefile
@@ -5,10 +5,11 @@
# $FreeBSD$
#
-PORTNAME= gj-${JDKSUBDIR}
+PORTNAME= gj
PORTVERSION= 0.6m
CATEGORIES= java
MASTER_SITES= http://www.cis.unisa.edu.au/~pizza/gj/Distribution/
+PKGNAMESUFFIX= -${JDKSUBDIR}
DISTNAME= gjdist${GJDIST}
MAINTAINER= vs@FreeBSD.org
@@ -17,18 +18,20 @@ COMMENT= Extension of the Java programming language that supports generic types
WRKSRC= ${WRKDIR}/gj
NO_BUILD= YES
+USE_JAVA= yes
.if defined(GJ_WITH_JDK11)
GJDIST= 1.1
-USE_JAVA= 1.1
BINSUFX= 11
+JAVA_VERSION= 1.1
.else
GJDIST= 1.2
-USE_JAVA= 1.2+
+JAVA_VERSION= 1.2+
.endif
JDKSUBDIR= jdk${GJDIST}
PLIST_SUB+= JDKSUBDIR=${JDKSUBDIR}
+PLIST_FILES?= bin/gjc bin/gjcr bin/gj
do-install:
${MKDIR} ${PREFIX}/lib/gj/${JDKSUBDIR}
diff --git a/java/gj/pkg-plist b/java/gj/pkg-plist
index d2e3c51eeb9d..11b7819a72bb 100644
--- a/java/gj/pkg-plist
+++ b/java/gj/pkg-plist
@@ -356,7 +356,4 @@ lib/gj/%%JDKSUBDIR%%/java/util/Vector.class
@dirrm lib/gj/%%JDKSUBDIR%%/java/util
@dirrm lib/gj/%%JDKSUBDIR%%/java
@dirrm lib/gj/%%JDKSUBDIR%%
-@dirrm lib/gj
-bin/gjc
-bin/gjcr
-bin/gj
+@unexec rmdir %D/lib/gj 2>/dev/null || true