diff options
author | schmonz <schmonz> | 2002-06-30 15:01:47 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2002-06-30 15:01:47 +0000 |
commit | 2030653c9df01f6205b8491faca55905e1f2776f (patch) | |
tree | 0ee0f19358fd88265595eaa8f7fb1eecef31add7 /lang | |
parent | 082a0ad5ea9c8aa98adb3f0969742abf744b43b9 (diff) | |
download | pkgsrc-2030653c9df01f6205b8491faca55905e1f2776f.tar.gz |
Register lang/sun{jre,jdk}13 as stub packages on Darwin, pointing
to the included 1.3.1 JDK. Teach USE_JAVA about this. Approved by
jwise and agc.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/sun-jdk13/Makefile | 17 | ||||
-rw-r--r-- | lang/sun-jdk13/PLIST.Darwin | 2 | ||||
-rw-r--r-- | lang/sun-jre13/Makefile | 20 | ||||
-rw-r--r-- | lang/sun-jre13/PLIST.Darwin | 2 |
4 files changed, 36 insertions, 5 deletions
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile index 6557f4217d5..321fa9cdcec 100644 --- a/lang/sun-jdk13/Makefile +++ b/lang/sun-jdk13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/03/19 16:33:58 tron Exp $ +# $NetBSD: Makefile,v 1.14 2002/06/30 15:01:48 schmonz Exp $ # MASTER_SITES is very special, and must end in "=": DISTNAME= j2sdk-1_3_1_02-linux-i386 @@ -28,6 +28,13 @@ NO_BIN_ON_FTP= ${RESTRICTED} .include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Darwin" +DISTFILES= # empty +NO_PATCH= # defined +NO_CONFIGURE= # defined +PLIST_SRC= ${PKGDIR}/PLIST.Darwin +.endif + .if !defined(JDK_HOME) JDK_HOME:= ${LOCALBASE}/java .endif @@ -36,11 +43,13 @@ NO_BUILD= yes # since we change PREFIX: NO_MTREE= yes -ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* LDD= ${TRUE} post-fetch: +. if ${OPSYS} != "Darwin" @${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +. endif post-extract: @${RM} -rf ${WRKSRC}/jre ${WRKSRC}/bin/java @@ -51,9 +60,13 @@ post-patch: # This is ugly. The chown should happen after copying, ot tar should have # a way to override permissions. do-install: +. if ${OPSYS} == "Darwin" + @${ECHO_MSG} "Darwin ships with a JDK based on Sun's 1.3.1 release." +. else ${INSTALL_PROGRAM_DIR} ${PREFIX} ${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC} ${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${PREFIX} -xpf- +. endif .include "../../mk/bsd.pkg.mk" diff --git a/lang/sun-jdk13/PLIST.Darwin b/lang/sun-jdk13/PLIST.Darwin new file mode 100644 index 00000000000..99b06f3ae69 --- /dev/null +++ b/lang/sun-jdk13/PLIST.Darwin @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.Darwin,v 1.1 2002/06/30 15:01:48 schmonz Exp $ +@comment Darwin ships with a JDK based on Sun's 1.3.1 release. diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile index 37b1d1cb35d..7c3411b9658 100644 --- a/lang/sun-jre13/Makefile +++ b/lang/sun-jre13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/04/04 12:29:49 tron Exp $ +# $NetBSD: Makefile,v 1.21 2002/06/30 15:01:49 schmonz Exp $ # MASTER_SITES is very special, and must end in "=": DISTNAME= j2re-1_3_1_02-linux-i386 @@ -27,11 +27,19 @@ NO_BIN_ON_FTP= ${RESTRICTED} .include "../../mk/bsd.prefs.mk" # Needs to be after bsd.prefs.mk -.if ${OPSYS} != "Linux" +.if ${OPSYS} == "NetBSD" DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 .endif +.if ${OPSYS} == "Darwin" +DISTFILES= # empty +NO_PATCH= # defined +NO_CONFIGURE= # defined +NO_BUILD= # defined +PLIST_SRC= ${PKGDIR}/PLIST.Darwin +.endif + .if !defined(JDK_HOME) JDK_HOME:= ${LOCALBASE}/java .endif @@ -39,11 +47,13 @@ JDK_HOME:= ${LOCALBASE}/java # since we change PREFIX: NO_MTREE= yes -ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* LDD= ${TRUE} post-fetch: +. if ${OPSYS} != "Darwin" @${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +. endif post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f @@ -54,11 +64,15 @@ do-build: # This is ugly. The chown should happen after copying, or tar should have # a way to override permissions. do-install: +. if ${OPSYS} == "Darwin" + @${ECHO_MSG} "Darwin ships with a JRE based on Sun's 1.3.1 release." +. else ${INSTALL_PROGRAM_DIR} ${PREFIX} ${PREFIX}/jre ${INSTALL_PROGRAM_DIR} ${PREFIX} ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKDIR}/java ${PREFIX}/bin/java ${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC} ${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${PREFIX}/jre -xpf- +. endif .include "../../emulators/suse_linux/Makefile.application" diff --git a/lang/sun-jre13/PLIST.Darwin b/lang/sun-jre13/PLIST.Darwin new file mode 100644 index 00000000000..87cd9f48e6a --- /dev/null +++ b/lang/sun-jre13/PLIST.Darwin @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.Darwin,v 1.1 2002/06/30 15:01:49 schmonz Exp $ +@comment Darwin ships with a JRE based on Sun's 1.3.1 release. |