From 08e833403e143dfa9357d623edda2a32c5401107 Mon Sep 17 00:00:00 2001 From: jwise Date: Tue, 1 Feb 2000 02:21:54 +0000 Subject: Update this to use ELF version of jdk-1.1.8 distribution on ELFin i386 systems. Many thanks to Scott Bartram/OrionSoft for providing this (and the a.out version) --- lang/jdk/Makefile | 33 +++++++++++++++++++++++++++------ lang/jdk/files/md5 | 3 ++- lang/jdk/pkg/PLIST | 31 ++++--------------------------- lang/jdk/pkg/PLIST-aout | 27 +++++++++++++++++++++++++++ lang/jdk/pkg/PLIST-elf | 22 ++++++++++++++++++++++ 5 files changed, 82 insertions(+), 34 deletions(-) create mode 100644 lang/jdk/pkg/PLIST-aout create mode 100644 lang/jdk/pkg/PLIST-elf (limited to 'lang/jdk') diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index 7523ea9e48a..d274de2a94a 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.14 2000/01/15 02:08:04 jwise Exp $ +# $NetBSD: Makefile,v 1.15 2000/02/01 02:21:54 jwise Exp $ # +.include "../../mk/bsd.prefs.mk" VERSION=1.1.8 -DISTNAME= jdk${VERSION}-rc1 PKGNAME= jdk-${VERSION} CATEGORIES= lang MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/java/i386/${VERSION}/ \ ftp://ftp.de.netbsd.org/pub/NetBSD/misc/java/i386/${VERSION}/ EXTRACT_SUFX= .tgz -MAINTAINER= packages@netbsd.org +MAINTAINER= jwise@netbsd.org HOMEPAGE= http://www.quick.com.au/java/ .include "../../mk/bsd.prefs.mk" @@ -17,7 +17,17 @@ HOMEPAGE= http://www.quick.com.au/java/ JDK_HOME:= ${LOCALBASE}/java .endif +.if ${OBJECT_FMT} == "ELF" +DISTNAME= jdk${VERSION}-rc1-elf +WRKSRC= ${WRKDIR}/jdk${VERSION}-elf +PLIST_SRC= ${PKGDIR}/PLIST-elf +.else +DISTNAME= jdk${VERSION}-rc1 WRKSRC= ${WRKDIR}/jdk${VERSION} +PLIST_SRC= ${PKGDIR}/PLIST-aout +.endif +PLIST_SRC+= ${PKGDIR}/PLIST + NO_BUILD= yes # since we change PREFIX: NO_MTREE= yes @@ -27,16 +37,27 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 RESTRICTED= "No redistribution of the Java(tm) Development Kit" NO_CDROM= ${RESTRICTED} +.if ${OBJECT_FMT} == "ELF" +# This gross hack normalizes the shlib names so that automatic +# shared library handling will work. +pre-install: + @for X in ${WRKSRC}/lib/i386/green_threads/lib*.so ;do \ + if [ -f $$X.* ] ;then \ + ${MV} $$X $$X.* ;\ + elif [ -f "$$X" ] ;then \ + ${MV} $$X $$X.1.1.8 ;\ + fi ;\ + done +.endif + do-install: + ${RM} -f ${WRKSRC}/*.orig ${MKDIR} ${JDK_HOME} cd ${WRKSRC} ; ${GTAR} pcf - . | ( cd ${JDK_HOME} ; ${GTAR} pvxf - ) ${SED} \ -e 's|@JDK_HOME@|${JDK_HOME}|g' \ <${PKGDIR}/MESSAGE >${MESSAGE_FILE} -show-shlib-type: - echo a.out - .include "../../mk/bsd.pkg.mk" # This needs to be after bsd.pkg.mk diff --git a/lang/jdk/files/md5 b/lang/jdk/files/md5 index d2907e59544..51b26dbe565 100644 --- a/lang/jdk/files/md5 +++ b/lang/jdk/files/md5 @@ -1,3 +1,4 @@ -$NetBSD: md5,v 1.5 2000/01/11 12:35:07 hubertf Exp $ +$NetBSD: md5,v 1.6 2000/02/01 02:21:56 jwise Exp $ MD5 (jdk1.1.8-rc1.tgz) = 117e27c001acb7a474261fb5fa7dced2 +MD5 (jdk1.1.8-rc1-elf.tgz) = 3265a7d843e95e472fabdbebcc01c132 diff --git a/lang/jdk/pkg/PLIST b/lang/jdk/pkg/PLIST index c53e3f6d1b8..121edbd167f 100644 --- a/lang/jdk/pkg/PLIST +++ b/lang/jdk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2000/01/11 12:35:09 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/02/01 02:21:56 jwise Exp $ bin/i386/green_threads/javah_g bin/i386/green_threads/javah bin/i386/green_threads/java_g @@ -103,32 +103,6 @@ include/java_lang_ClassLoader.h include/dlwrap.h include/java_lang_Thread.h include/java_lang_ThreadGroup.h -lib/i386/green_threads/libXm.so.1.2 -lib/i386/green_threads/libXm.so -lib/i386/green_threads/libjava_g.so -lib/i386/green_threads/libjava_g.so.1.1.8 -lib/i386/green_threads/libjava.so -lib/i386/green_threads/libjava.so.1.1.8 -lib/i386/green_threads/libmath_g.so -lib/i386/green_threads/libmath.so -lib/i386/green_threads/libzip_g.so -lib/i386/green_threads/libzip.so -lib/i386/green_threads/libnet_g.so -lib/i386/green_threads/libnet.so -lib/i386/green_threads/libagent_g.so -lib/i386/green_threads/libagent.so -lib/i386/green_threads/libmmedia_g.so -lib/i386/green_threads/libmmedia.so -lib/i386/green_threads/libawt_g.so -lib/i386/green_threads/libawt_g.so.1.1.8 -lib/i386/green_threads/libawt.so -lib/i386/green_threads/libawt.so.1.1.8 -lib/i386/green_threads/libtawt_g.so -lib/i386/green_threads/libtawt.so -lib/i386/green_threads/libjpeg_g.so -lib/i386/green_threads/libjpeg.so -lib/i386/green_threads/libsysresource_g.so -lib/i386/green_threads/libsysresource.so lib/awt.properties lib/security/java.security lib/content-types.properties @@ -525,9 +499,11 @@ index.html @dirrm lib/locale @dirrm lib/i386/green_threads @dirrm lib/i386 +@dirrm lib @dirrm include/netbsd @dirrm include/green_threads/include @dirrm include/green_threads +@dirrm include @dirrm demo/i18n/code @dirrm demo/i18n/TextBound @dirrm demo/i18n/NumberFormat @@ -597,3 +573,4 @@ index.html @dirrm demo @dirrm bin/i386/green_threads @dirrm bin/i386 +@dirrm bin diff --git a/lang/jdk/pkg/PLIST-aout b/lang/jdk/pkg/PLIST-aout new file mode 100644 index 00000000000..2c9690225f6 --- /dev/null +++ b/lang/jdk/pkg/PLIST-aout @@ -0,0 +1,27 @@ +@comment $NetBSD: PLIST-aout,v 1.1 2000/02/01 02:21:57 jwise Exp $ +lib/i386/green_threads/libXm.so +lib/i386/green_threads/libXm.so.1.2 +lib/i386/green_threads/libjava_g.so +lib/i386/green_threads/libjava_g.so.1.1.8 +lib/i386/green_threads/libjava.so +lib/i386/green_threads/libjava.so.1.1.8 +lib/i386/green_threads/libmath_g.so +lib/i386/green_threads/libmath.so +lib/i386/green_threads/libzip_g.so +lib/i386/green_threads/libzip.so +lib/i386/green_threads/libnet_g.so +lib/i386/green_threads/libnet.so +lib/i386/green_threads/libagent_g.so +lib/i386/green_threads/libagent.so +lib/i386/green_threads/libmmedia_g.so +lib/i386/green_threads/libmmedia.so +lib/i386/green_threads/libawt_g.so +lib/i386/green_threads/libawt_g.so.1.1.8 +lib/i386/green_threads/libawt.so +lib/i386/green_threads/libawt.so.1.1.8 +lib/i386/green_threads/libtawt_g.so +lib/i386/green_threads/libtawt.so +lib/i386/green_threads/libjpeg_g.so +lib/i386/green_threads/libjpeg.so +lib/i386/green_threads/libsysresource_g.so +lib/i386/green_threads/libsysresource.so diff --git a/lang/jdk/pkg/PLIST-elf b/lang/jdk/pkg/PLIST-elf new file mode 100644 index 00000000000..ce0c7fac78d --- /dev/null +++ b/lang/jdk/pkg/PLIST-elf @@ -0,0 +1,22 @@ +@comment $NetBSD: PLIST-elf,v 1.1 2000/02/01 02:21:57 jwise Exp $ +lib/i386/green_threads/libXm.so.2.0 +lib/i386/green_threads/libagent.so.1.1.8 +lib/i386/green_threads/libagent_g.so.1.1.8 +lib/i386/green_threads/libawt.so.1.1.8 +lib/i386/green_threads/libawt_g.so.1.1.8 +lib/i386/green_threads/libjava.so.1.1.8 +lib/i386/green_threads/libjava_g.so.1.1.8 +lib/i386/green_threads/libjpeg.so.1.1.8 +lib/i386/green_threads/libjpeg_g.so.1.1.8 +lib/i386/green_threads/libmath.so.1.1.8 +lib/i386/green_threads/libmath_g.so.1.1.8 +lib/i386/green_threads/libmmedia.so.1.1.8 +lib/i386/green_threads/libmmedia_g.so.1.1.8 +lib/i386/green_threads/libnet.so.1.1.8 +lib/i386/green_threads/libnet_g.so.1.1.8 +lib/i386/green_threads/libsysresource.so.1.1.8 +lib/i386/green_threads/libsysresource_g.so.1.1.8 +lib/i386/green_threads/libtawt.so.1.1.8 +lib/i386/green_threads/libtawt_g.so.1.1.8 +lib/i386/green_threads/libzip.so.1.1.8 +lib/i386/green_threads/libzip_g.so.1.1.8 -- cgit v1.2.3