pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/sun-jre15 Add support for amd64.
details: https://anonhg.NetBSD.org/pkgsrc/rev/9f6253a9737f
branches: trunk
changeset: 522102:9f6253a9737f
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Dec 03 00:51:21 2006 +0000
description:
Add support for amd64.
Still installs and deinstalls cleanly on i386.
XXX: NetBSD's Linux emulation on amd64 is not good enough for it
yet, but this way it's easier to install Linux Java for improving
the emulation.
diffstat:
lang/sun-jre15/Makefile | 17 +-
lang/sun-jre15/Makefile.common | 4 +-
lang/sun-jre15/PLIST | 738 ----------------------------------------
lang/sun-jre15/PLIST.i386 | 738 ++++++++++++++++++++++++++++++++++++++++
lang/sun-jre15/PLIST.x86_64 | 647 +++++++++++++++++++++++++++++++++++
lang/sun-jre15/distinfo | 5 +-
lang/sun-jre15/sfiles-i386.mk | 49 ++
lang/sun-jre15/sfiles-x86_64.mk | 38 ++
lang/sun-jre15/sfiles.mk | 49 --
9 files changed, 1491 insertions(+), 794 deletions(-)
diffs (truncated from 2357 to 300 lines):
diff -r 23a2cfd6827c -r 9f6253a9737f lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile Sat Dec 02 23:15:58 2006 +0000
+++ b/lang/sun-jre15/Makefile Sun Dec 03 00:51:21 2006 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.37 2006/10/23 19:38:15 tv Exp $
+# $NetBSD: Makefile,v 1.38 2006/12/03 00:51:21 wiz Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
-DISTNAME= jre-1_5_0_09-linux-i586
+DISTNAME= jre-1_5_0_09-linux-${DIST_ARCH}
PKGNAME= sun-jre15-5.0.9
PKGREVISION= 1
MASTER_SITES= # empty
SHORT_NAME= JRE
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//}
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:C/-linux-.*//}
JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \
servertool tnameserv
REQD_DIRS= ${JAVA_HOME}
@@ -19,7 +19,16 @@
REQD_DIRS+= ${JAVA_HOME}/lib/images/cursors
REQD_DIRS+= ${JAVA_HOME}/lib/security
CONF_FILES= # empty
-.sinclude "sfiles.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+DIST_ARCH= i586
+.sinclude "sfiles-i386.mk"
+.elif ${MACHINE_ARCH} == "x86_64"
+DIST_ARCH= amd64
+.sinclude "sfiles-x86_64.mk"
+.endif
+
.for FILE in ${SFILES}
CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
diff -r 23a2cfd6827c -r 9f6253a9737f lang/sun-jre15/Makefile.common
--- a/lang/sun-jre15/Makefile.common Sat Dec 02 23:15:58 2006 +0000
+++ b/lang/sun-jre15/Makefile.common Sun Dec 03 00:51:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2006/10/24 12:42:10 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.16 2006/12/03 00:51:21 wiz Exp $
CATEGORIES= lang java
COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -40,7 +40,7 @@
.include "../../emulators/suse_linux/Makefile.application"
.if !defined(USE_NATIVE_LINUX)
-ONLY_FOR_PLATFORM= *-*-i386
+ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
. if ${SUSE_DIR_PREFIX} == "suse91"
DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
. endif
diff -r 23a2cfd6827c -r 9f6253a9737f lang/sun-jre15/PLIST
--- a/lang/sun-jre15/PLIST Sat Dec 02 23:15:58 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,738 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2006/08/23 08:50:34 jmmv Exp $
-bin/sun15-java
-bin/sun15-javaws
-bin/sun15-keytool
-bin/sun15-orbd
-bin/sun15-policytool
-bin/sun15-rmid
-bin/sun15-rmiregistry
-bin/sun15-servertool
-bin/sun15-tnameserv
-java/sun-1.5/.systemPrefs/.system.lock
-java/sun-1.5/.systemPrefs/.systemRootModFile
-java/sun-1.5/CHANGES
-java/sun-1.5/COPYRIGHT
-java/sun-1.5/LICENSE
-java/sun-1.5/README
-java/sun-1.5/THIRDPARTYLICENSEREADME.txt
-java/sun-1.5/Welcome.html
-java/sun-1.5/bin/ControlPanel
-java/sun-1.5/bin/java
-java/sun-1.5/bin/java_vm
-java/sun-1.5/bin/javaws
-java/sun-1.5/bin/keytool
-java/sun-1.5/bin/kinit
-java/sun-1.5/bin/klist
-java/sun-1.5/bin/ktab
-java/sun-1.5/bin/orbd
-java/sun-1.5/bin/pack200
-java/sun-1.5/bin/policytool
-java/sun-1.5/bin/rmid
-java/sun-1.5/bin/rmiregistry
-java/sun-1.5/bin/servertool
-java/sun-1.5/bin/tnameserv
-java/sun-1.5/bin/unpack200
-java/sun-1.5/javaws/javaws
-java/sun-1.5/lib/audio/soundbank.gm
-java/sun-1.5/lib/charsets.jar
-java/sun-1.5/lib/classlist
-java/sun-1.5/lib/cmm/CIEXYZ.pf
-java/sun-1.5/lib/cmm/GRAY.pf
-java/sun-1.5/lib/cmm/LINEAR_RGB.pf
-java/sun-1.5/lib/cmm/PYCC.pf
-java/sun-1.5/lib/cmm/sRGB.pf
-java/sun-1.5/lib/content-types.properties.default
-java/sun-1.5/lib/deploy.jar
-java/sun-1.5/lib/ext/dnsns.jar
-java/sun-1.5/lib/ext/localedata.jar
-java/sun-1.5/lib/ext/sunjce_provider.jar
-java/sun-1.5/lib/ext/sunpkcs11.jar
-java/sun-1.5/lib/flavormap.properties.default
-java/sun-1.5/lib/fontconfig.RedHat.2.1.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.2.1.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.3.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.3.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.8.0.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.8.0.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.9.0.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.9.0.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.properties.src.default
-java/sun-1.5/lib/fontconfig.SuSE.bfc.default
-java/sun-1.5/lib/fontconfig.SuSE.properties.src.default
-java/sun-1.5/lib/fontconfig.Sun.2003.bfc.default
-java/sun-1.5/lib/fontconfig.Sun.2003.properties.src.default
-java/sun-1.5/lib/fontconfig.Sun.bfc.default
-java/sun-1.5/lib/fontconfig.Sun.properties.src.default
-java/sun-1.5/lib/fontconfig.Turbo.8.0.bfc.default
-java/sun-1.5/lib/fontconfig.Turbo.8.0.properties.src.default
-java/sun-1.5/lib/fontconfig.Turbo.bfc.default
-java/sun-1.5/lib/fontconfig.Turbo.properties.src.default
-java/sun-1.5/lib/fontconfig.bfc.default
-java/sun-1.5/lib/fontconfig.properties.src.default
-java/sun-1.5/lib/fonts/LucidaBrightDemiBold.ttf
-java/sun-1.5/lib/fonts/LucidaBrightDemiItalic.ttf
-java/sun-1.5/lib/fonts/LucidaBrightItalic.ttf
-java/sun-1.5/lib/fonts/LucidaBrightRegular.ttf
-java/sun-1.5/lib/fonts/LucidaSansDemiBold.ttf
-java/sun-1.5/lib/fonts/LucidaSansRegular.ttf
-java/sun-1.5/lib/fonts/LucidaTypewriterBold.ttf
-java/sun-1.5/lib/fonts/LucidaTypewriterRegular.ttf
-java/sun-1.5/lib/fonts/fonts.dir
-java/sun-1.5/lib/${MACHINE_ARCH}/awt_robot
-java/sun-1.5/lib/${MACHINE_ARCH}/client/Xusage.txt
-java/sun-1.5/lib/${MACHINE_ARCH}/client/libjsig.so
-java/sun-1.5/lib/${MACHINE_ARCH}/client/libjvm.so
-java/sun-1.5/lib/${MACHINE_ARCH}/gtkhelper
-java/sun-1.5/lib/${MACHINE_ARCH}/headless/libmawt.so
-java/sun-1.5/lib/${MACHINE_ARCH}/jvm.cfg.default
-java/sun-1.5/lib/${MACHINE_ARCH}/libJdbcOdbc.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libawt.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libcmm.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libdcpr.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libdeploy.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libdt_socket.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libfontmanager.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libhprof.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libinstrument.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libioser12.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libj2pkcs11.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjaas_unix.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjava.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjava_crw_demo.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjavaplugin_nscp_gcc29.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjawt.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjdwp.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjpeg.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjsig.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjsound.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libjsoundalsa.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libmanagement.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libmlib_image.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libnative_chmod.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libnet.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libnio.so
-java/sun-1.5/lib/${MACHINE_ARCH}/librmi.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libunpack.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libverify.so
-java/sun-1.5/lib/${MACHINE_ARCH}/libzip.so
-java/sun-1.5/lib/${MACHINE_ARCH}/motif21/libmawt.so
-java/sun-1.5/lib/${MACHINE_ARCH}/native_threads/libhpi.so
-java/sun-1.5/lib/${MACHINE_ARCH}/server/Xusage.txt
-java/sun-1.5/lib/${MACHINE_ARCH}/server/libjsig.so
-java/sun-1.5/lib/${MACHINE_ARCH}/server/libjvm.so
-java/sun-1.5/lib/${MACHINE_ARCH}/xawt/libmawt.so
-java/sun-1.5/lib/im/indicim.jar
-java/sun-1.5/lib/im/thaiim.jar
-java/sun-1.5/lib/images/cursors/cursors.properties.default
-java/sun-1.5/lib/images/cursors/invalid32x32.gif
-java/sun-1.5/lib/images/cursors/motif_CopyDrop32x32.gif
-java/sun-1.5/lib/images/cursors/motif_CopyNoDrop32x32.gif
-java/sun-1.5/lib/images/cursors/motif_LinkDrop32x32.gif
-java/sun-1.5/lib/images/cursors/motif_LinkNoDrop32x32.gif
-java/sun-1.5/lib/images/cursors/motif_MoveDrop32x32.gif
-java/sun-1.5/lib/images/cursors/motif_MoveNoDrop32x32.gif
-java/sun-1.5/lib/images/icons/sun-java.png
-java/sun-1.5/lib/images/icons/sun-java_HighContrast.png
-java/sun-1.5/lib/images/icons/sun-java_HighContrastInverse.png
-java/sun-1.5/lib/images/icons/sun-java_LowContrast.png
-java/sun-1.5/lib/javaws.jar
-java/sun-1.5/lib/javaws/Java1.5.ico
-java/sun-1.5/lib/javaws/messages.properties.default
-java/sun-1.5/lib/javaws/messages_de.properties.default
-java/sun-1.5/lib/javaws/messages_es.properties.default
-java/sun-1.5/lib/javaws/messages_fr.properties.default
-java/sun-1.5/lib/javaws/messages_it.properties.default
-java/sun-1.5/lib/javaws/messages_ja.properties.default
-java/sun-1.5/lib/javaws/messages_ko.properties.default
-java/sun-1.5/lib/javaws/messages_sv.properties.default
-java/sun-1.5/lib/javaws/messages_zh_CN.properties.default
-java/sun-1.5/lib/javaws/messages_zh_HK.properties.default
-java/sun-1.5/lib/javaws/messages_zh_TW.properties.default
-java/sun-1.5/lib/javaws/miniSplash.jpg
-java/sun-1.5/lib/jce.jar
-java/sun-1.5/lib/jsse.jar
-java/sun-1.5/lib/jvm.hprof.txt
-java/sun-1.5/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
-java/sun-1.5/lib/logging.properties.default
-java/sun-1.5/lib/management/jmxremote.access
-java/sun-1.5/lib/management/jmxremote.password.template
-java/sun-1.5/lib/management/management.properties.default
-java/sun-1.5/lib/management/snmp.acl.template
-java/sun-1.5/lib/net.properties.default
-java/sun-1.5/lib/oblique-fonts/LucidaSansDemiOblique.ttf
-java/sun-1.5/lib/oblique-fonts/LucidaSansOblique.ttf
-java/sun-1.5/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf
-java/sun-1.5/lib/oblique-fonts/LucidaTypewriterOblique.ttf
-java/sun-1.5/lib/oblique-fonts/fonts.dir
-java/sun-1.5/lib/plugin.jar
-java/sun-1.5/lib/psfont.properties.ja.default
-java/sun-1.5/lib/psfontj2d.properties.default
-java/sun-1.5/lib/rt.jar
-${SUN_JRE15_USE_JCE}java/sun-1.5/lib/security/COPYRIGHT.html
-${SUN_JRE15_USE_JCE}java/sun-1.5/lib/security/README.txt
-java/sun-1.5/lib/security/US_export_policy.jar
-java/sun-1.5/lib/security/cacerts
-java/sun-1.5/lib/security/java.policy
-java/sun-1.5/lib/security/java.security.default
-java/sun-1.5/lib/security/javaws.policy
-java/sun-1.5/lib/security/local_policy.jar
-java/sun-1.5/lib/sound.properties.default
-java/sun-1.5/lib/zi/Africa/Abidjan
-java/sun-1.5/lib/zi/Africa/Accra
-java/sun-1.5/lib/zi/Africa/Addis_Ababa
-java/sun-1.5/lib/zi/Africa/Algiers
-java/sun-1.5/lib/zi/Africa/Asmera
-java/sun-1.5/lib/zi/Africa/Bamako
-java/sun-1.5/lib/zi/Africa/Bangui
-java/sun-1.5/lib/zi/Africa/Banjul
-java/sun-1.5/lib/zi/Africa/Bissau
-java/sun-1.5/lib/zi/Africa/Blantyre
-java/sun-1.5/lib/zi/Africa/Brazzaville
-java/sun-1.5/lib/zi/Africa/Bujumbura
-java/sun-1.5/lib/zi/Africa/Cairo
-java/sun-1.5/lib/zi/Africa/Casablanca
-java/sun-1.5/lib/zi/Africa/Ceuta
-java/sun-1.5/lib/zi/Africa/Conakry
-java/sun-1.5/lib/zi/Africa/Dakar
-java/sun-1.5/lib/zi/Africa/Dar_es_Salaam
-java/sun-1.5/lib/zi/Africa/Djibouti
-java/sun-1.5/lib/zi/Africa/Douala
-java/sun-1.5/lib/zi/Africa/El_Aaiun
-java/sun-1.5/lib/zi/Africa/Freetown
-java/sun-1.5/lib/zi/Africa/Gaborone
-java/sun-1.5/lib/zi/Africa/Harare
-java/sun-1.5/lib/zi/Africa/Johannesburg
-java/sun-1.5/lib/zi/Africa/Kampala
-java/sun-1.5/lib/zi/Africa/Khartoum
-java/sun-1.5/lib/zi/Africa/Kigali
-java/sun-1.5/lib/zi/Africa/Kinshasa
-java/sun-1.5/lib/zi/Africa/Lagos
-java/sun-1.5/lib/zi/Africa/Libreville
-java/sun-1.5/lib/zi/Africa/Lome
-java/sun-1.5/lib/zi/Africa/Luanda
-java/sun-1.5/lib/zi/Africa/Lubumbashi
-java/sun-1.5/lib/zi/Africa/Lusaka
-java/sun-1.5/lib/zi/Africa/Malabo
-java/sun-1.5/lib/zi/Africa/Maputo
-java/sun-1.5/lib/zi/Africa/Maseru
-java/sun-1.5/lib/zi/Africa/Mbabane
-java/sun-1.5/lib/zi/Africa/Mogadishu
-java/sun-1.5/lib/zi/Africa/Monrovia
-java/sun-1.5/lib/zi/Africa/Nairobi
-java/sun-1.5/lib/zi/Africa/Ndjamena
-java/sun-1.5/lib/zi/Africa/Niamey
Home |
Main Index |
Thread Index |
Old Index