Fri Feb 20 21:42:27 2009 UTC ()
Fix PR40090 - remove optionally generated register*.html files in pre-install


(abs)
diff -r1.11 -r1.12 pkgsrc/lang/sun-jdk6/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/lang/sun-jdk6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/sun-jdk6/Attic/Makefile 2009/02/08 00:23:20 1.11
+++ pkgsrc/lang/sun-jdk6/Attic/Makefile 2009/02/20 21:42:27 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2009/02/08 00:23:20 christos Exp $ 1# $NetBSD: Makefile,v 1.12 2009/02/20 21:42:27 abs Exp $
2 2
3DISTNAME= jdk-6u12-linux-${DIST_ARCH} 3DISTNAME= jdk-6u12-linux-${DIST_ARCH}
4#PKGREVISION= 1 4#PKGREVISION= 1
5PKGNAME= sun-jdk6-6.0.12 5PKGNAME= sun-jdk6-6.0.12
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7 7
8DOWNLOAD_NAME= JDK 6u12 8DOWNLOAD_NAME= JDK 6u12
9SHORT_NAME= JDK 9SHORT_NAME= JDK
10 10
11DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6 11DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
12 12
13WRKSRC= ${WRKDIR}/jdk1.6.0_12 13WRKSRC= ${WRKDIR}/jdk1.6.0_12
14JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ 14JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
@@ -21,14 +21,20 @@ LICENSE= sun-jdk6-license @@ -21,14 +21,20 @@ LICENSE= sun-jdk6-license
21# Remove parts that are in common with the JRE 21# Remove parts that are in common with the JRE
22# 22#
23post-extract: 23post-extract:
24 common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \ 24 common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \
25 cd ${WRKSRC}; for i in $$common; do \ 25 cd ${WRKSRC}; for i in $$common; do \
26 if [ -d $$i ]; then \ 26 if [ -d $$i ]; then \
27 ${RM} -rf $$i; \ 27 ${RM} -rf $$i; \
28 else \ 28 else \
29 ${RM} -f $$i; \ 29 ${RM} -f $$i; \
30 fi; \ 30 fi; \
31 done 31 done
32 ${LN} -sf . ${WRKSRC}/jre 32 ${LN} -sf . ${WRKSRC}/jre
33 33
 34pre-install:
 35 # These files are generated the *first* time the package is built
 36 ${RM} -f ${WRKSRC}/register.html
 37 ${RM} -f ${WRKSRC}/register_ja.html
 38 ${RM} -f ${WRKSRC}/register_zh_CN.html
 39
34.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"