Thu Feb 11 09:44:27 2010 UTC ()
Assert OWNERship for legal reasons.
I'm attempting to upstream our patches through the formal procedure.
(Snoracle does not make contribution easy.)


(tnn)
diff -r1.16 -r1.17 pkgsrc/lang/openjdk7/Makefile

cvs diff -r1.16 -r1.17 pkgsrc/lang/openjdk7/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2010/02/02 23:12:53 1.16
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2010/02/11 09:44:26 1.17
@@ -1,167 +1,167 @@ @@ -1,167 +1,167 @@
1# $NetBSD: Makefile,v 1.16 2010/02/02 23:12:53 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.17 2010/02/11 09:44:26 tnn Exp $
2 2
3DISTNAME= openjdk-7-ea-src-b78-17_dec_2009 3DISTNAME= openjdk-7-ea-src-b78-17_dec_2009
4PKGNAME= openjdk7-1.7.0.78.20100102 4PKGNAME= openjdk7-1.7.0.78.20100102
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= tnn@NetBSD.org 10OWNER= tnn@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16DISTFILES= ${DEFAULT_DISTFILES} 16DISTFILES= ${DEFAULT_DISTFILES}
17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
18 18
19# diff between distfile and bsd-port branch. To check out, use: 19# diff between distfile and bsd-port branch. To check out, use:
20# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/" 20# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/"
21PATCHFILES+= jdk-7-bsd-port-78.20100102.diff.bz2 21PATCHFILES+= jdk-7-bsd-port-78.20100102.diff.bz2
22PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} 22PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/}
23 23
24CACERTS= cacerts-20091013.tar.bz2 24CACERTS= cacerts-20091013.tar.bz2
25DISTFILES+= ${CACERTS} 25DISTFILES+= ${CACERTS}
26EXTRACT_ONLY+= ${CACERTS} 26EXTRACT_ONLY+= ${CACERTS}
27 27
28JAVA_NAME= openjdk7 28JAVA_NAME= openjdk7
29JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 29JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
30JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ 30JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \
31 policytool rmid rmiregistry servertool tnameserv 31 policytool rmid rmiregistry servertool tnameserv
32 32
33BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip 33BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
34BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip 34BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
35MAKE_ENV+= PKGSRC_ZIPEXE=${PREFIX}/bin/zip 35MAKE_ENV+= PKGSRC_ZIPEXE=${PREFIX}/bin/zip
36MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip 36MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip
37MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv 37MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv
38 38
39DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 39DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
40#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf 40#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf
41#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf 41#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf
42 42
43NO_CONFIGURE= yes 43NO_CONFIGURE= yes
44USE_LANGUAGES= c c++ 44USE_LANGUAGES= c c++
45USE_TOOLS+= gmake pax 45USE_TOOLS+= gmake pax
46UNLIMIT_RESOURCES= datasize stacksize 46UNLIMIT_RESOURCES= datasize stacksize
47WRKSRC= ${WRKDIR}/openjdk 47WRKSRC= ${WRKDIR}/openjdk
48 48
49BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 49BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
50PREPEND_PATH+= ${ALT_BOOTDIR}/bin 50PREPEND_PATH+= ${ALT_BOOTDIR}/bin
51 51
52MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR} 52MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR}
53MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib 53MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib
54MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include 54MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include
55MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include 55MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
56MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin 56MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
57MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX} 57MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX}
58MAKE_ENV+= ALT_X11_PATH=${X11BASE} 58MAKE_ENV+= ALT_X11_PATH=${X11BASE}
59 59
60MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1} 60MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
61 61
62MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc 62MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
63MAKE_ENV+= NO_DOCS=true 63MAKE_ENV+= NO_DOCS=true
64MAKE_ENV+= SKIP_COMPARE_IMAGES=true 64MAKE_ENV+= SKIP_COMPARE_IMAGES=true
65MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes 65MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
66MAKE_ENV+= SKIP_DEBUG_BUILD=yes 66MAKE_ENV+= SKIP_DEBUG_BUILD=yes
67 67
68MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\"" 68MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\""
69 69
70BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/} 70BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
71PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/} 71PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
72PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS} 72PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS}
73 73
74.include "../../mk/bsd.prefs.mk" 74.include "../../mk/bsd.prefs.mk"
75.include "bootstrap.mk" 75.include "bootstrap.mk"
76.include "icedtea-extras.mk" 76.include "icedtea-extras.mk"
77 77
78SUBST_CLASSES+= add-rpaths 78SUBST_CLASSES+= add-rpaths
79SUBST_STAGE.add-rpaths= pre-build 79SUBST_STAGE.add-rpaths= pre-build
80SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles 80SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles
81SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \ 81SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \
82 jdk/make/sun/awt/mawt.gmk \ 82 jdk/make/sun/awt/mawt.gmk \
83 jdk/make/sun/jawt/Makefile \ 83 jdk/make/sun/jawt/Makefile \
84 jdk/make/sun/jdga/Makefile \ 84 jdk/make/sun/jdga/Makefile \
85 jdk/make/sun/splashscreen/Makefile \ 85 jdk/make/sun/splashscreen/Makefile \
86 jdk/make/sun/xawt/Makefile 86 jdk/make/sun/xawt/Makefile
87SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g' 87SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g'
88 88
89SUBST_CLASSES+= fontpaths 89SUBST_CLASSES+= fontpaths
90SUBST_STAGE.fontpaths= pre-build 90SUBST_STAGE.fontpaths= pre-build
91SUBST_MESSAGE.fontpaths= fixing font paths 91SUBST_MESSAGE.fontpaths= fixing font paths
92SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties 92SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
93SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c 93SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
94SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g' 94SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
95SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g' 95SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
96 96
97PLIST_VARS+= i386 97PLIST_VARS+= i386
98.if ${MACHINE_ARCH} == "i386" 98.if ${MACHINE_ARCH} == "i386"
99PLIST.i386= yes 99PLIST.i386= yes
100.endif 100.endif
101 101
102post-extract: 102post-extract:
103 chmod +x ${ANT_BIN}/ant 103 chmod +x ${ANT_BIN}/ant
104 cd ${WRKDIR}/${ICEDTEA}/plugin/icedteanp/java && pax -rw . \ 104 cd ${WRKDIR}/${ICEDTEA}/plugin/icedteanp/java && pax -rw . \
105 ${WRKSRC}/jdk/src/share/classes 105 ${WRKSRC}/jdk/src/share/classes
106 cd ${WRKDIR}/${ICEDTEA}/netx && pax -rw . \ 106 cd ${WRKDIR}/${ICEDTEA}/netx && pax -rw . \
107 ${WRKSRC}/jdk/src/share/classes 107 ${WRKSRC}/jdk/src/share/classes
108 108
109do-build: ${WRKDIR}/stage3-done 109do-build: ${WRKDIR}/stage3-done
110 110
111# stage 1 builds a native JDK using the bootstrap binaries 111# stage 1 builds a native JDK using the bootstrap binaries
112${WRKDIR}/stage1-done: 112${WRKDIR}/stage1-done:
113 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 113 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
114 rm -rf ${WRKDIR}/bootstrap 114 rm -rf ${WRKDIR}/bootstrap
115 cd ${BUILDDIR} && mv j2sdk-image ${WRKDIR}/bootstrap 115 cd ${BUILDDIR} && mv j2sdk-image ${WRKDIR}/bootstrap
116 rm -rf ${BUILDDIR} 116 rm -rf ${BUILDDIR}
117 touch ${WRKDIR}/stage1-done 117 touch ${WRKDIR}/stage1-done
118 118
119# stage 2 rebuilds the JDK using native tools 119# stage 2 rebuilds the JDK using native tools
120${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done 120${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
121 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 121 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
122 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep 122 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
123 touch ${WRKDIR}/stage2-done 123 touch ${WRKDIR}/stage2-done
124 124
125# stage 3 builds third party add-ons 125# stage 3 builds third party add-ons
126${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 126${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
127 touch ${WRKDIR}/stage3-done 127 touch ${WRKDIR}/stage3-done
128 128
129${WRKDIR}/cacerts.out: 129${WRKDIR}/cacerts.out:
130 for cert in ${WRKDIR}/cacerts/*.crt; do \ 130 for cert in ${WRKDIR}/cacerts/*.crt; do \
131 ${ECHO} yes | LC_ALL=C ${BUILDDIR}/bin/keytool \ 131 ${ECHO} yes | LC_ALL=C ${BUILDDIR}/bin/keytool \
132 -importcert \ 132 -importcert \
133 -keystore ${.TARGET} \ 133 -keystore ${.TARGET} \
134 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \ 134 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.crt,\\1,'` \
135 -file $$cert \ 135 -file $$cert \
136 -storepass pkgsrc; \ 136 -storepass pkgsrc; \
137 done 137 done
138 138
139do-install: 139do-install:
140 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 140 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
141 cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \ 141 cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \
142 ${DESTDIR}${JAVA_HOME}/. 142 ${DESTDIR}${JAVA_HOME}/.
143 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \ 143 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \
144 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts 144 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
145 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h 145 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h
146 ln -s ${LOWER_OPSYS}/jni_md.h \ 146 ln -s ${LOWER_OPSYS}/jni_md.h \
147 ${DESTDIR}${JAVA_HOME}/include/jni_md.h 147 ${DESTDIR}${JAVA_HOME}/include/jni_md.h
148 148
149.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*) 149.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*)
150MAKE_ENV+= PTHREAD_STACKSIZE=1024 150MAKE_ENV+= PTHREAD_STACKSIZE=1024
151.endif 151.endif
152 152
153.include "../../fonts/fontconfig/buildlink3.mk" 153.include "../../fonts/fontconfig/buildlink3.mk"
154.include "../../graphics/freetype2/buildlink3.mk" 154.include "../../graphics/freetype2/buildlink3.mk"
155BUILDLINK_DEPMETHOD.cups?= build 155BUILDLINK_DEPMETHOD.cups?= build
156.include "../../print/cups/buildlink3.mk" 156.include "../../print/cups/buildlink3.mk"
157.include "../../x11/libXext/buildlink3.mk" 157.include "../../x11/libXext/buildlink3.mk"
158.include "../../x11/libXi/buildlink3.mk" 158.include "../../x11/libXi/buildlink3.mk"
159BUILDLINK_DEPMETHOD.libXp?= build 159BUILDLINK_DEPMETHOD.libXp?= build
160.include "../../x11/libXp/buildlink3.mk" 160.include "../../x11/libXp/buildlink3.mk"
161BUILDLINK_DEPMETHOD.libXt?= build 161BUILDLINK_DEPMETHOD.libXt?= build
162.include "../../x11/libXt/buildlink3.mk" 162.include "../../x11/libXt/buildlink3.mk"
163.include "../../x11/libXtst/buildlink3.mk" 163.include "../../x11/libXtst/buildlink3.mk"
164.include "../../x11/libXrender/buildlink3.mk" 164.include "../../x11/libXrender/buildlink3.mk"
165.include "../../x11/xextproto/buildlink3.mk" 165.include "../../x11/xextproto/buildlink3.mk"
166.include "../../mk/java-env.mk" 166.include "../../mk/java-env.mk"
167.include "../../mk/bsd.pkg.mk" 167.include "../../mk/bsd.pkg.mk"