diff options
author | hq <hq@FreeBSD.org> | 2005-02-10 02:02:19 +0800 |
---|---|---|
committer | hq <hq@FreeBSD.org> | 2005-02-10 02:02:19 +0800 |
commit | 8d0b4a6d2e8a9f7d35f38bebf346df9347436e9a (patch) | |
tree | fe80423cc7768be25598f0072b7588012132a857 /java | |
parent | 6b3786ea1dd3c4d74ac6677dfb9772f25c4a5ad8 (diff) | |
download | freebsd-ports-gnome-8d0b4a6d2e8a9f7d35f38bebf346df9347436e9a.tar.gz freebsd-ports-gnome-8d0b4a6d2e8a9f7d35f38bebf346df9347436e9a.tar.zst freebsd-ports-gnome-8d0b4a6d2e8a9f7d35f38bebf346df9347436e9a.zip |
- Update to bsd.java.mk 2.0 (and use JAVA_OS=native)
- Unbreak on 5.3+ [1]
- JAVALIBDIR -> JDKLIBDIR (JAVALIBDIR is used for something else)
- portlint: fix COMMENT length
- Use PKGNAMESUFFIX to allow multiple instances with different JDKs
Submitted by: mat [1] (via IRC)
Diffstat (limited to 'java')
-rw-r--r-- | java/openjit/Makefile | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/java/openjit/Makefile b/java/openjit/Makefile index 5d17a1185a3e..f16984c9070e 100644 --- a/java/openjit/Makefile +++ b/java/openjit/Makefile @@ -10,29 +10,16 @@ PORTVERSION= 1.1.16 PORTREVISION= 1 CATEGORIES= java MASTER_SITES= http://www.openjit.org/dist/ +PKGNAMESUFFIX= -${JAVA_PORT:S,java/,,} DISTNAME= OpenJIT-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A high-performance reflective Java Just-In-Time (JIT) bytecode compiler +COMMENT= A high-performance reflective Java Just-In-Time bytecode compiler -BROKEN= "Configure fails with diablo-jdk13" -EXPIRATION_DATE=2005-02-18 -DEPRECATED= ${BROKEN} - -# Only native JDKs are allowed. Default is java/diablo-jdk13 -.if defined(WITH_JDK13) -JAVA_HOME= ${PREFIX}/jdk1.3.1 -BUILD_DEPENDS= ${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk13 -.elif defined(WITH_JDK12) -JAVA_HOME= ${PREFIX}/jdk1.2.2 -BUILD_DEPENDS= ${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk12 -.elif defined(WITH_JDK11) -JAVA_HOME= ${PREFIX}/jdk1.1.8 -BUILD_DEPENDS= ${JAVA_HOME}/bin/java:${PORTSDIR}/java/jdk11 -.else -JAVA_HOME= ${PREFIX}/diablo-jdk1.3.1 -BUILD_DEPENDS= ${JAVA_HOME}/bin/java:${PORTSDIR}/java/diablo-jdk13 -.endif +USE_JAVA= yes +JAVA_OS= native +JAVA_VENDOR?= bsdjava +JAVA_VERSION?= 1.3 ONLY_FOR_ARCHS= i386 @@ -40,10 +27,14 @@ USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME} +MAKE_ARGS= ARCH=X86 PLIST_SUB+= JAVADIR=${JAVA_HOME:S,${PREFIX}/,,} -.if defined(WITH_JDK11) -JAVALIBDIR= ${PREFIX}/lib/OpenJIT + +.include <bsd.port.pre.mk> + +.if ${JAVA_PORT_VERSION} == 1.1 +JDKLIBDIR= ${PREFIX}/lib/OpenJIT PLIST_SUB+= JAVA2:="@comment " JAVA11:="" .else PLIST_SUB+= JAVA2:="" JAVA11:="@comment " @@ -53,15 +44,15 @@ post-configure: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/INSTALL do-install: -.if defined(WITH_JDK11) - @${MKDIR} ${JAVALIBDIR} - @${INSTALL_DATA} ${WRKSRC}/libOpenJIT.so ${JAVALIBDIR} - @${INSTALL_DATA} ${WRKSRC}/OpenJIT.jar ${JAVALIBDIR} +.if ${JAVA_PORT_VERSION} == 1.1 + @${MKDIR} ${JDKLIBDIR} + @${INSTALL_DATA} ${WRKSRC}/libOpenJIT.so ${JDKLIBDIR} + @${INSTALL_DATA} ${WRKSRC}/OpenJIT.jar ${JDKLIBDIR} .else @${MKDIR} ${JAVA_HOME}/jre/classes @${INSTALL_DATA} ${WRKSRC}/libOpenJIT.so ${JAVA_HOME}/jre/lib/i386 @cd ${WRKSRC} && ${FIND} org -name '*.class' \ - | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${JAVA_HOME}/jre/classes + | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${JAVA_HOME}/jre/classes > /dev/null 2>&1 @${FIND} ${JAVA_HOME}/jre/classes -type d | ${XARGS} ${CHMOD} a+rx .endif .if !defined(NOPORTDOCS) @@ -73,4 +64,4 @@ do-install: @${ECHO_MSG} "" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> |