aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorhq <hq@FreeBSD.org>2006-05-24 07:22:36 +0800
committerhq <hq@FreeBSD.org>2006-05-24 07:22:36 +0800
commit918ed7dd2a23d4cd048c7d62e0083d77b4b60d99 (patch)
tree81738818eca6c8229a7fd643ce22d0435f567c41 /java
parenta58137b907ffe26c146fdb7c427ddc885c947911 (diff)
downloadfreebsd-ports-gnome-918ed7dd2a23d4cd048c7d62e0083d77b4b60d99.tar.gz
freebsd-ports-gnome-918ed7dd2a23d4cd048c7d62e0083d77b4b60d99.tar.zst
freebsd-ports-gnome-918ed7dd2a23d4cd048c7d62e0083d77b4b60d99.zip
- Update to bsd.java.mk 2.0
- Use %%JAVAJARDIR%% in pkg-plist - Add $FreeBSD$ tag - Use SUB_FILES (rather than PKGINSTALL) to configure launcher shell script - Set JAVA_VERSION for javavmwrapper in launcher shell script - Renamed launcher script: jasmin.sh -> jasmin - Register java/javavmwrapper in RUN_DEPENDS - Bump PORTREVISION
Diffstat (limited to 'java')
-rw-r--r--java/jasmin/Makefile12
-rw-r--r--java/jasmin/files/jasmin.sh.in6
-rw-r--r--java/jasmin/pkg-install8
-rw-r--r--java/jasmin/pkg-plist5
4 files changed, 17 insertions, 14 deletions
diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index ed70823bca56..288d05a7c21a 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jasmin
PORTVERSION= 1.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= java lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -15,10 +16,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Java Assembler Interface
+RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
+
USE_ZIP= yes
USE_ANT= yes
ALL_TARGET= jasmin
-USE_JAVA= 1.2+
+USE_JAVA= yes
+JAVA_VERSION= 1.2+
+
+SUB_FILES= jasmin.sh
do-install:
${INSTALL_DATA} ${WRKSRC}/jasmin.jar ${JAVAJARDIR}
@@ -26,6 +32,7 @@ do-install:
cd ${WRKSRC}/examples ; \
${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/\{} \; ;\
${FIND} . -type f -exec ${INSTALL_DATA} \{} ${EXAMPLESDIR}/\{} \;
+ ${INSTALL_SCRIPT} ${WRKDIR}/jasmin.sh ${PREFIX}/bin/jasmin
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCDIR}
@@ -34,7 +41,4 @@ do-install:
${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
.endif
-post-install:
- ${ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
.include <bsd.port.mk>
diff --git a/java/jasmin/files/jasmin.sh.in b/java/jasmin/files/jasmin.sh.in
new file mode 100644
index 000000000000..ef28eddd96a5
--- /dev/null
+++ b/java/jasmin/files/jasmin.sh.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" \
+ exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@"
diff --git a/java/jasmin/pkg-install b/java/jasmin/pkg-install
deleted file mode 100644
index bfcc64a512c2..000000000000
--- a/java/jasmin/pkg-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if [ x$2 = xPOST-INSTALL ]; then
-sed s+%%PKG_PREFIX%%+${PKG_PREFIX}+ >${PKG_PREFIX}/bin/jasmin.sh << 'EOF'
-#!/bin/sh
-java -jar %%PKG_PREFIX%%/share/java/jasmin.jar $*
-EOF
-chmod 755 ${PKG_PREFIX}/bin/jasmin.sh
-fi
diff --git a/java/jasmin/pkg-plist b/java/jasmin/pkg-plist
index f10e57e7a985..5989e4e96df0 100644
--- a/java/jasmin/pkg-plist
+++ b/java/jasmin/pkg-plist
@@ -1,5 +1,6 @@
-share/java/classes/jasmin.jar
-bin/jasmin.sh
+@comment $FreeBSD$
+%%JAVAJARDIR%%/jasmin.jar
+bin/jasmin
%%EXAMPLESDIR%%/ANewArray.j
%%EXAMPLESDIR%%/AnInterface.j
%%EXAMPLESDIR%%/Arrays.j