diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2003-03-06 03:18:39 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2003-03-06 03:18:39 +0000 |
commit | 9fbe0725cb270d0bae2aaf7a1eeba555c3dd1c63 (patch) | |
tree | ea13d923e8be570a10d40d5f5020eb2c64be8057 /java | |
parent | It's ".if", not "if" (diff) |
. Update to SR3.
. de-pkg-comment.
. Move check for distfile after the include of bsd.pre.port.mk so it
actually works correctly.
. Make install owner/group safe (*).
PR: 36411 (*)
Hopefully approved by: znerd
Notes
Notes:
svn path=/head/; revision=77009
Diffstat (limited to 'java')
-rw-r--r-- | java/linux-ibm-jdk13/Makefile | 16 | ||||
-rw-r--r-- | java/linux-ibm-jdk13/distinfo | 2 | ||||
-rw-r--r-- | java/linux-ibm-jdk13/pkg-comment | 1 | ||||
-rw-r--r-- | java/linux-ibm-jdk13/pkg-plist | 15 |
4 files changed, 25 insertions, 9 deletions
diff --git a/java/linux-ibm-jdk13/Makefile b/java/linux-ibm-jdk13/Makefile index 91652c2ff24a..559635e1f371 100644 --- a/java/linux-ibm-jdk13/Makefile +++ b/java/linux-ibm-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 2 # cxia32131-20020622 +PORTREVISION= 3 # SR3 CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-ibm- @@ -15,6 +15,7 @@ DISTNAME= IBMJava2-SDK-131 EXTRACT_SUFX= .tgz MAINTAINER= znerd@FreeBSD.org +COMMENT= IBM Java Development Kit 1.3 for Linux BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper @@ -32,7 +33,7 @@ LINUX_SH?= ${LINUXBASE}/bin/sh NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" -DOWNLOAD_URL= http://www6.software.ibm.com/dl/dklx130/dklx130-i?S_PKG=ia32ww +DOWNLOAD_URL= http://www6.software.ibm.com/dl/lxdk/lxdk-h?S_PKG=ia32ww&S_TACT=&S_CMP= .if defined(WITH_JAPANESE_FONTS) PLIST_SUB+= JAPANESE="" @@ -42,12 +43,14 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/wadalab-gothic.ttf:${PORTSDIR}/j PLIST_SUB+= JAPANESE="@comment " .endif -.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE=You must manually fetch the IBM Java SDK ${JDK_VERSION} for Linux archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again. -.endif +CPIO?= /usr/bin/cpio .include <bsd.port.pre.mk> +.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) +IGNORE=You must manually fetch the IBM Java SDK ${JDK_VERSION} for Linux archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again +.endif + post-patch: @for shfn in `${GREP} -r '^#!/bin/sh' ${WRKSRC}|${AWK} -F: '{print $$1}'`; do \ if [ ! -h $$shfn ]; then \ @@ -59,7 +62,8 @@ post-patch: do-install: ${MKDIR} ${APP_HOME} - ${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${APP_HOME} -xpf- + cd ${WRKSRC} && ${FIND} . \ + | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${APP_HOME} ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # IBM-JDK${PORTVERSION}_${PORTREVISION}" post-install: diff --git a/java/linux-ibm-jdk13/distinfo b/java/linux-ibm-jdk13/distinfo index cfd55ea20edd..7a5b6cddbd3b 100644 --- a/java/linux-ibm-jdk13/distinfo +++ b/java/linux-ibm-jdk13/distinfo @@ -1 +1 @@ -MD5 (IBMJava2-SDK-131.tgz) = c42372b96dc2bac21523a19ba8ae85a1 +MD5 (IBMJava2-SDK-131.tgz) = 24d7405bfceaa10a9b57bcb74a90559f diff --git a/java/linux-ibm-jdk13/pkg-comment b/java/linux-ibm-jdk13/pkg-comment deleted file mode 100644 index e575681a1625..000000000000 --- a/java/linux-ibm-jdk13/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -IBM Java Development Kit 1.3 for Linux diff --git a/java/linux-ibm-jdk13/pkg-plist b/java/linux-ibm-jdk13/pkg-plist index ec052a0f7e34..d18e5ac72327 100644 --- a/java/linux-ibm-jdk13/pkg-plist +++ b/java/linux-ibm-jdk13/pkg-plist @@ -1,10 +1,18 @@ @exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java" @unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" %%T%%/bin/HtmlConverter +%%T%%/bin/exe/jextract +%%T%%/bin/exe/jextract_g +%%T%%/bin/exe/jformat +%%T%%/bin/exe/jformat_g %%T%%/bin/java %%T%%/bin/java_g %%T%%/bin/javaw %%T%%/bin/javaw_g +%%T%%/bin/jextract +%%T%%/bin/jextract_g +%%T%%/bin/jformat +%%T%%/bin/jformat_g %%T%%/bin/jvmtcf %%T%%/bin/jvmtcf_g %%T%%/bin/keytool @@ -227,6 +235,8 @@ %%T%%/jre/bin/libhprof.so %%T%%/jre/bin/libhpi_g.so %%T%%/jre/bin/libhpi.so +%%T%%/jre/bin/libframe_g.so +%%T%%/jre/bin/libframe.so %%T%%/jre/bin/libfontmanager_g.so %%T%%/jre/bin/libfontmanager.so %%T%%/jre/bin/libdt_socket_g.so @@ -245,6 +255,8 @@ %%T%%/jre/bin/keytool %%T%%/jre/bin/jvmtcf_g %%T%%/jre/bin/jvmtcf +%%T%%/jre/bin/jvmdcf_g +%%T%%/jre/bin/jvmdcf %%T%%/jre/bin/javaw_g %%T%%/jre/bin/javaw %%T%%/jre/bin/javaplugin_g.so @@ -276,6 +288,7 @@ %%T%%/jre/bin/awt_robot %%T%%/jre/bin/JavaPluginControlPanel %%T%%/src.jar +%%T%%/include/jvmras.h %%T%%/include/jvmpi.h %%T%%/include/jvmdi.h %%T%%/include/jvmmi.h @@ -283,7 +296,6 @@ %%T%%/include/jni.h %%T%%/include/jawt_md.h %%T%%/include/jawt.h -%%T%%/include/ras.h %%T%%/docs/COPYRIGHT %%T%%/docs/sdk/LICENSE_da.html %%T%%/docs/sdk/LICENSE_de.html @@ -880,6 +892,7 @@ @dirrm %%T%%/jre/lib/ext @dirrm %%T%%/jre/lib/cmm @dirrm %%T%%/jre/lib/audio +@dirrm %%T%%/jre/lib/applet @dirrm %%T%%/jre/lib @dirrm %%T%%/jre/bin/exe @dirrm %%T%%/jre/bin/classic |