summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--lang/blackdown-jre13/DESCR2
-rw-r--r--lang/blackdown-jre13/Makefile29
-rw-r--r--lang/blackdown-jre13/Makefile.common12
-rw-r--r--lang/blackdown-jre13/PLIST37
5 files changed, 50 insertions, 33 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 437915763fd..851377d49ae 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.1270 2003/01/29 10:58:55 jlam Exp $
+$NetBSD: CHANGES,v 1.1271 2003/01/29 11:01:01 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -468,3 +468,4 @@ Changes to the packages collection and infrastructure in 2003:
Updated kile to 1.32 [markd 2003-01-29]
Added filmgimp-0.15 [jlam 2003-01-29]
Updated kaffe to 1.0.7nb1 [jlam 2003-01-29]
+ Updated blackdown-jre13 to 1nb1 [jlam 2003-01-29]
diff --git a/lang/blackdown-jre13/DESCR b/lang/blackdown-jre13/DESCR
index eac5deb24af..d1c5e621408 100644
--- a/lang/blackdown-jre13/DESCR
+++ b/lang/blackdown-jre13/DESCR
@@ -1,2 +1,2 @@
-This is the Linux port of the Blackdown Java(tm) Runtime Environment
+This is the Linux port of the Blackdown Java(tm) Runtime Environment,
version 1.3.1.
diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile
index f2009710d6e..c94bd3622b7 100644
--- a/lang/blackdown-jre13/Makefile
+++ b/lang/blackdown-jre13/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2002/11/25 14:07:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/29 11:01:02 jlam Exp $
#
BASENAME= j2re
DISTNAME= ${EXTNAME}-${BLACKDOWN_ARCH}
PKGNAME= blackdown-jre13-1
+PKGREVISION= 1
COMMENT= Blackdown's Java(tm) Runtime Environment 1.3.1
.if ${MACHINE_ARCH} == "arm"
@@ -19,6 +20,32 @@ PLIST_SRC= ${PKGDIR}/PLIST
PLIST_SRC+= ${PKGDIR}/PLIST.i386
.endif
+USE_PKGINSTALL= yes
+OWN_DIRS= ${PREFIX}
+OWN_DIRS+= ${PREFIX}/lib
+OWN_DIRS+= ${PREFIX}/lib/${BLACKDOWN_ARCH}
+OWN_DIRS+= ${PREFIX}/lib/applet
+OWN_DIRS+= ${PREFIX}/lib/ext
+OWN_DIRS+= ${PREFIX}/lib/images
+OWN_DIRS+= ${PREFIX}/lib/images/cursors
+OWN_DIRS+= ${PREFIX}/lib/security
+OWN_DIRS+= ${PREFIX}/plugin/${BLACKDOWN_ARCH}
+OWN_DIRS+= ${PREFIX}/plugin
+SFILES= content-types.properties flavormap.properties
+SFILES+= font.properties font.properties.ja
+SFILES+= font.properties.zh jvm.cfg
+SFILES+= images/cursors/cursors.properties psfont.properties.ja
+SFILES+= psfontj2d.properties security/java.security
+SUPPORT_FILES= # empty
+.for FILE in ${SFILES}
+SUPPORT_FILES+= ${PREFIX}/lib/${FILE}.default ${PREFIX}/lib/${FILE}
+.endfor
+
+do-configure:
+ cd ${WRKSRC}/lib; for file in ${SFILES}; do \
+ ${MV} -f $$file $$file.default; \
+ done
+
.include "../../mk/bsd.pkg.mk"
PREFIX= ${JVM_HOME}
diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index b4317a5753d..2876b1389cc 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2002/12/05 05:51:18 grant Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/01/29 11:01:02 jlam Exp $
#
RELVERSION= 1.3.1
@@ -46,10 +46,8 @@ JVM_HOME= ${LOCALBASE}/java/blackdown-${RELVERSION}
WRKSRC= ${WRKDIR}/${BASENAME}${RELVERSION}
-USE_BUILDLINK2= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-NO_MTREE= # defined, since we change PREFIX
+USE_BUILDLINK2= yes
+NO_MTREE= yes # since we change PREFIX
PLIST_SUBST+= BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
@@ -64,7 +62,9 @@ post-fetch:
fi
.endif
-post-patch:
+do-build: # nothing
+
+post-build:
${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
${FIND} ${WRKSRC} -name '*.1.gz' -print | ${XARGS} ${GUNZIP_CMD}
diff --git a/lang/blackdown-jre13/PLIST b/lang/blackdown-jre13/PLIST
index 653acd77390..2f25a8c3e7c 100644
--- a/lang/blackdown-jre13/PLIST
+++ b/lang/blackdown-jre13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/25 14:07:42 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/29 11:01:02 jlam Exp $
CHANGES
COPYRIGHT
INSTALL
@@ -8,9 +8,11 @@ README
bin/.java_wrapper
bin/JavaPluginControlPanel
bin/awt_robot
+bin/j2sdk-config
bin/java
bin/keytool
bin/policytool
+bin/realpath
bin/rmid
bin/rmiregistry
bin/tnameserv
@@ -28,19 +30,17 @@ bin/${BLACKDOWN_ARCH}/native_threads/rmid
bin/${BLACKDOWN_ARCH}/native_threads/rmiregistry
bin/${BLACKDOWN_ARCH}/native_threads/tnameserv
bin/${BLACKDOWN_ARCH}/realpath
-bin/j2sdk-config
-bin/realpath
lib/audio/soundbank.gm
lib/cmm/CIEXYZ.pf
lib/cmm/GRAY.pf
lib/cmm/LINEAR_RGB.pf
lib/cmm/PYCC.pf
lib/cmm/sRGB.pf
-lib/content-types.properties
-lib/flavormap.properties
-lib/font.properties
-lib/font.properties.ja
-lib/font.properties.zh
+lib/content-types.properties.default
+lib/flavormap.properties.default
+lib/font.properties.default
+lib/font.properties.ja.default
+lib/font.properties.zh.default
lib/fonts/LucidaBrightDemiBold.ttf
lib/fonts/LucidaBrightDemiItalic.ttf
lib/fonts/LucidaBrightItalic.ttf
@@ -77,7 +77,7 @@ lib/${BLACKDOWN_ARCH}/libpreemptive_close.so
lib/${BLACKDOWN_ARCH}/libverify.so
lib/${BLACKDOWN_ARCH}/libzip.so
lib/${BLACKDOWN_ARCH}/native_threads/libhpi.so
-lib/images/cursors/cursors.properties
+lib/images/cursors/cursors.properties.default
lib/images/cursors/invalid32x32.gif
lib/images/cursors/motif_CopyDrop32x32.gif
lib/images/cursors/motif_CopyNoDrop32x32.gif
@@ -86,7 +86,7 @@ lib/images/cursors/motif_LinkNoDrop32x32.gif
lib/images/cursors/motif_MoveDrop32x32.gif
lib/images/cursors/motif_MoveNoDrop32x32.gif
lib/javaplugin.jar
-lib/jvm.cfg
+lib/jvm.cfg.default
lib/jvm.hprof.txt
lib/jvm.jcov.txt
lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -101,12 +101,12 @@ lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
-lib/psfont.properties.ja
-lib/psfontj2d.properties
+lib/psfont.properties.ja.default
+lib/psfontj2d.properties.default
lib/rt.jar
lib/security/cacerts
lib/security/java.policy
-lib/security/java.security
+lib/security/java.security.default
lib/sunrsasign.jar
lib/tzmappings
man/ja/man1/java.1
@@ -122,13 +122,10 @@ man/man1/tnameserv.1
plugin/${BLACKDOWN_ARCH}/mozilla/javaplugin_oji.so
plugin/${BLACKDOWN_ARCH}/netscape6
@dirrm plugin/${BLACKDOWN_ARCH}/mozilla
-@dirrm plugin/${BLACKDOWN_ARCH}
-@dirrm plugin
@dirrm man/man1
@dirrm man/ja/man1
@dirrm man/ja
@dirrm man
-@dirrm lib/security
@dirrm lib/locale/zh_TW/LC_MESSAGES
@dirrm lib/locale/zh_TW.BIG5/LC_MESSAGES
@dirrm lib/locale/zh_TW.BIG5
@@ -154,20 +151,12 @@ plugin/${BLACKDOWN_ARCH}/netscape6
@dirrm lib/locale/de/LC_MESSAGES
@dirrm lib/locale/de
@dirrm lib/locale
-@dirrm lib/images/cursors
-@dirrm lib/images
@dirrm lib/${BLACKDOWN_ARCH}/native_threads
@dirrm lib/${BLACKDOWN_ARCH}/green_threads
@dirrm lib/${BLACKDOWN_ARCH}/classic
-@dirrm lib/${BLACKDOWN_ARCH}
@dirrm lib/fonts
-@exec ${MKDIR} %D/lib/ext
-@dirrm lib/ext
@dirrm lib/cmm
@dirrm lib/audio
-@exec ${MKDIR} %D/lib/applet
-@dirrm lib/applet
-@dirrm lib
@dirrm bin/${BLACKDOWN_ARCH}/native_threads
@dirrm bin/${BLACKDOWN_ARCH}/green_threads
@dirrm bin/${BLACKDOWN_ARCH}