Fri Feb 20 11:56:55 2009 UTC ()
since registration.xml is only generated the first time a package is built
on a box, just remove it in post-install so we can have a consistent
package build


(abs)
diff -r1.16 -r1.17 pkgsrc/lang/sun-jre6/Makefile
diff -r1.11 -r1.12 pkgsrc/lang/sun-jre6/PLIST.linux-i386
cvs diff -r1.16 -r1.17 pkgsrc/lang/sun-jre6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/Makefile 2009/02/08 00:23:20 1.16
+++ pkgsrc/lang/sun-jre6/Attic/Makefile 2009/02/20 11:56:55 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2009/02/08 00:23:20 christos Exp $ 1# $NetBSD: Makefile,v 1.17 2009/02/20 11:56:55 abs Exp $
2 2
3# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce 3# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
4# Note: Update DOWNLOAD_NAME when you update the JRE version 4# Note: Update DOWNLOAD_NAME when you update the JRE version
5 5
6DISTNAME= jre-6u12-linux-${DIST_ARCH} 6DISTNAME= jre-6u12-linux-${DIST_ARCH}
7#PKGREVISION= 1 7#PKGREVISION= 1
8PKGNAME= sun-jre6-6.0.12 8PKGNAME= sun-jre6-6.0.12
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10 10
11DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u12 11DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u12
12SHORT_NAME= JRE 12SHORT_NAME= JRE
13 13
14USE_TOOLS+= pax 14USE_TOOLS+= pax
@@ -81,26 +81,30 @@ post-extract: @@ -81,26 +81,30 @@ post-extract:
81 ${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock 81 ${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock
82 ${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile 82 ${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
83 83
84do-configure: 84do-configure:
85 cd ${WRKSRC}/lib; for file in ${SFILES}; do \ 85 cd ${WRKSRC}/lib; for file in ${SFILES}; do \
86 ${MV} -f $$file $$file.default; \ 86 ${MV} -f $$file $$file.default; \
87 done 87 done
88 88
89pre-install: 89pre-install:
90.if !empty(PKG_OPTIONS:Msun-jre-jce) 90.if !empty(PKG_OPTIONS:Msun-jre-jce)
91 cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security 91 cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
92.endif 92.endif
93 93
 94# This file is generated the *first* time the package is built on a box
 95post-install:
 96 ${RM} -f ${DESTDIR}${PREFIX}/java/sun-6/lib/servicetag/registration.xml
 97
94# 98#
95# re-create sfiles.mk from properties and config files 99# re-create sfiles.mk from properties and config files
96# 100#
97makesfiles: 101makesfiles:
98 ${ECHO} > sfiles-${MACHINE_ARCH}.mk '# $$Net''BSD$$' 102 ${ECHO} > sfiles-${MACHINE_ARCH}.mk '# $$Net''BSD$$'
99 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#' 103 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#'
100 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Created with "make makesfiles"' 104 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Created with "make makesfiles"'
101 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Do not edit this file manually!' 105 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Do not edit this file manually!'
102 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#' 106 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#'
103 cd ${WRKSRC}/lib && ${FIND} * -name fontconfig.\* -o \ 107 cd ${WRKSRC}/lib && ${FIND} * -name fontconfig.\* -o \
104 -name \*.properties -o -name \*.properties.\?\? -o \ 108 -name \*.properties -o -name \*.properties.\?\? -o \
105 -name \*.cfg -o -name \*.security | \ 109 -name \*.cfg -o -name \*.security | \
106 ${SED} 's/^/SFILES+= /' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk 110 ${SED} 's/^/SFILES+= /' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk
cvs diff -r1.11 -r1.12 pkgsrc/lang/sun-jre6/Attic/PLIST.linux-i386 (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/PLIST.linux-i386 2009/02/19 16:27:26 1.11
+++ pkgsrc/lang/sun-jre6/Attic/PLIST.linux-i386 2009/02/20 11:56:55 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.linux-i386,v 1.11 2009/02/19 16:27:26 abs Exp $ 1@comment $NetBSD: PLIST.linux-i386,v 1.12 2009/02/20 11:56:55 abs Exp $
2bin/sun6-java 2bin/sun6-java
3bin/sun6-javaws 3bin/sun6-javaws
4bin/sun6-keytool 4bin/sun6-keytool
5bin/sun6-orbd 5bin/sun6-orbd
6bin/sun6-policytool 6bin/sun6-policytool
7bin/sun6-rmid 7bin/sun6-rmid
8bin/sun6-rmiregistry 8bin/sun6-rmiregistry
9bin/sun6-servertool 9bin/sun6-servertool
10bin/sun6-tnameserv 10bin/sun6-tnameserv
11java/sun-6/.systemPrefs/.system.lock 11java/sun-6/.systemPrefs/.system.lock
12java/sun-6/.systemPrefs/.systemRootModFile 12java/sun-6/.systemPrefs/.systemRootModFile
13java/sun-6/COPYRIGHT 13java/sun-6/COPYRIGHT
14java/sun-6/LICENSE 14java/sun-6/LICENSE
@@ -239,27 +239,26 @@ java/sun-6/lib/plugin.jar @@ -239,27 +239,26 @@ java/sun-6/lib/plugin.jar
239java/sun-6/lib/psfont.properties.ja.default 239java/sun-6/lib/psfont.properties.ja.default
240java/sun-6/lib/psfontj2d.properties.default 240java/sun-6/lib/psfontj2d.properties.default
241java/sun-6/lib/resources.jar 241java/sun-6/lib/resources.jar
242java/sun-6/lib/rt.jar 242java/sun-6/lib/rt.jar
243${PLIST.jce}java/sun-6/lib/security/COPYRIGHT.html 243${PLIST.jce}java/sun-6/lib/security/COPYRIGHT.html
244${PLIST.jce}java/sun-6/lib/security/README.txt 244${PLIST.jce}java/sun-6/lib/security/README.txt
245java/sun-6/lib/security/US_export_policy.jar 245java/sun-6/lib/security/US_export_policy.jar
246java/sun-6/lib/security/cacerts 246java/sun-6/lib/security/cacerts
247java/sun-6/lib/security/java.policy 247java/sun-6/lib/security/java.policy
248java/sun-6/lib/security/java.security.default 248java/sun-6/lib/security/java.security.default
249java/sun-6/lib/security/javaws.policy 249java/sun-6/lib/security/javaws.policy
250java/sun-6/lib/security/local_policy.jar 250java/sun-6/lib/security/local_policy.jar
251java/sun-6/lib/servicetag/jdk_header.png 251java/sun-6/lib/servicetag/jdk_header.png
252java/sun-6/lib/servicetag/registration.xml 
253java/sun-6/lib/sound.properties.default 252java/sun-6/lib/sound.properties.default
254java/sun-6/lib/zi/Africa/Abidjan 253java/sun-6/lib/zi/Africa/Abidjan
255java/sun-6/lib/zi/Africa/Accra 254java/sun-6/lib/zi/Africa/Accra
256java/sun-6/lib/zi/Africa/Addis_Ababa 255java/sun-6/lib/zi/Africa/Addis_Ababa
257java/sun-6/lib/zi/Africa/Algiers 256java/sun-6/lib/zi/Africa/Algiers
258java/sun-6/lib/zi/Africa/Asmara 257java/sun-6/lib/zi/Africa/Asmara
259java/sun-6/lib/zi/Africa/Bamako 258java/sun-6/lib/zi/Africa/Bamako
260java/sun-6/lib/zi/Africa/Bangui 259java/sun-6/lib/zi/Africa/Bangui
261java/sun-6/lib/zi/Africa/Banjul 260java/sun-6/lib/zi/Africa/Banjul
262java/sun-6/lib/zi/Africa/Bissau 261java/sun-6/lib/zi/Africa/Bissau
263java/sun-6/lib/zi/Africa/Blantyre 262java/sun-6/lib/zi/Africa/Blantyre
264java/sun-6/lib/zi/Africa/Brazzaville 263java/sun-6/lib/zi/Africa/Brazzaville
265java/sun-6/lib/zi/Africa/Bujumbura 264java/sun-6/lib/zi/Africa/Bujumbura