Thu Oct 15 08:47:32 2009 UTC ()
Make sure keytool is called with C locale so it understands "yes" on stdin.
Should fix build failure reported by Tobias Astrom.


(tnn)
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2009/10/14 13:44:26 1.2
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2009/10/15 08:47:32 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2009/10/14 13:44:26 tnn Exp $ 1# $NetBSD: Makefile,v 1.3 2009/10/15 08:47:32 tnn Exp $
2 2
3DISTNAME= openjdk-7-ea-src-b72-17_sep_2009 3DISTNAME= openjdk-7-ea-src-b72-17_sep_2009
4PKGNAME= openjdk7-1.7.0.72.20090924 4PKGNAME= openjdk7-1.7.0.72.20090924
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 6MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= http://openjdk.java.net/ 10HOMEPAGE= http://openjdk.java.net/
11COMMENT= Open-source implementation of the Java Platform, Standard Edition 11COMMENT= Open-source implementation of the Java Platform, Standard Edition
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -102,27 +102,27 @@ ${WRKDIR}/stage1-done: @@ -102,27 +102,27 @@ ${WRKDIR}/stage1-done:
102 102
103# stage 2 rebuilds the JDK using native tools 103# stage 2 rebuilds the JDK using native tools
104${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done 104${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
105 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 105 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
106 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep 106 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
107 touch ${WRKDIR}/stage2-done 107 touch ${WRKDIR}/stage2-done
108 108
109# stage 3 builds third party add-ons 109# stage 3 builds third party add-ons
110${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 110${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
111 touch ${WRKDIR}/stage3-done 111 touch ${WRKDIR}/stage3-done
112 112
113${WRKDIR}/cacerts.out: 113${WRKDIR}/cacerts.out:
114 for cert in ${WRKDIR}/cacerts/*.crt; do \ 114 for cert in ${WRKDIR}/cacerts/*.crt; do \
115 ${ECHO} yes | ${BUILDDIR}/bin/keytool \ 115 ${ECHO} yes | LC_ALL=C ${BUILDDIR}/bin/keytool \
116 -importcert \ 116 -importcert \
117 -keystore ${.TARGET} \ 117 -keystore ${.TARGET} \
118 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \ 118 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \
119 -file $$cert \ 119 -file $$cert \
120 -storepass pkgsrc; \ 120 -storepass pkgsrc; \
121 done 121 done
122 122
123do-install: 123do-install:
124 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 124 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
125 cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \ 125 cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \
126 ${DESTDIR}${JAVA_HOME}/. 126 ${DESTDIR}${JAVA_HOME}/.
127 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \ 127 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \
128 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts 128 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts