Fri Feb 20 14:37:58 2009 UTC ()
move registration.xml fix to pre-install and WRCSRC - suggested by obache@


(abs)
diff -r1.17 -r1.18 pkgsrc/lang/sun-jre6/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/lang/sun-jre6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/Makefile 2009/02/20 11:56:55 1.17
+++ pkgsrc/lang/sun-jre6/Attic/Makefile 2009/02/20 14:37:58 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2009/02/20 11:56:55 abs Exp $ 1# $NetBSD: Makefile,v 1.18 2009/02/20 14:37:58 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
@@ -77,34 +77,32 @@ PLIST_SUBST+= LIBX11="@comment " @@ -77,34 +77,32 @@ PLIST_SUBST+= LIBX11="@comment "
77.endif 77.endif
78 78
79post-extract: 79post-extract:
80 ${MKDIR} ${WRKSRC}/.systemPrefs 80 ${MKDIR} ${WRKSRC}/.systemPrefs
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 # This file is generated the *first* time the package is built on a box
 91 ${RM} -f ${WRKSRC}/lib/servicetag/registration.xml
90.if !empty(PKG_OPTIONS:Msun-jre-jce) 92.if !empty(PKG_OPTIONS:Msun-jre-jce)
91 cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security 93 cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
92.endif 94.endif
93 95
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 
98# 96#
99# re-create sfiles.mk from properties and config files 97# re-create sfiles.mk from properties and config files
100# 98#
101makesfiles: 99makesfiles:
102 ${ECHO} > sfiles-${MACHINE_ARCH}.mk '# $$Net''BSD$$' 100 ${ECHO} > sfiles-${MACHINE_ARCH}.mk '# $$Net''BSD$$'
103 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#' 101 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#'
104 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Created with "make makesfiles"' 102 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Created with "make makesfiles"'
105 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Do not edit this file manually!' 103 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '# Do not edit this file manually!'
106 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#' 104 ${ECHO} >> sfiles-${MACHINE_ARCH}.mk '#'
107 cd ${WRKSRC}/lib && ${FIND} * -name fontconfig.\* -o \ 105 cd ${WRKSRC}/lib && ${FIND} * -name fontconfig.\* -o \
108 -name \*.properties -o -name \*.properties.\?\? -o \ 106 -name \*.properties -o -name \*.properties.\?\? -o \
109 -name \*.cfg -o -name \*.security | \ 107 -name \*.cfg -o -name \*.security | \
110 ${SED} 's/^/SFILES+= /' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk 108 ${SED} 's/^/SFILES+= /' >> ${PKGDIR}/sfiles-${MACHINE_ARCH}.mk