Sun Oct 18 12:30:54 2009 UTC ()
set BUILDDIR correctly for DragonFly


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

--- pkgsrc/lang/openjdk7/Attic/Makefile 2009/10/15 08:47:32 1.3
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2009/10/18 12:30:54 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2009/10/15 08:47:32 tnn Exp $ 1# $NetBSD: Makefile,v 1.4 2009/10/18 12:30:54 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
@@ -49,27 +49,27 @@ MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILD @@ -49,27 +49,27 @@ MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILD
49MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include 49MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include
50MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include 50MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
51MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin 51MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
52MAKE_ENV+= ALT_X11_PATH=${X11BASE} 52MAKE_ENV+= ALT_X11_PATH=${X11BASE}
53 53
54MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1} 54MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
55 55
56MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc 56MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
57MAKE_ENV+= NO_DOCS=true 57MAKE_ENV+= NO_DOCS=true
58MAKE_ENV+= SKIP_COMPARE_IMAGES=true 58MAKE_ENV+= SKIP_COMPARE_IMAGES=true
59MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes 59MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
60MAKE_ENV+= SKIP_DEBUG_BUILD=yes 60MAKE_ENV+= SKIP_DEBUG_BUILD=yes
61 61
62BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/} 62BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
63PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/} 63PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
64PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS} 64PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS}
65 65
66.include "../../mk/bsd.prefs.mk" 66.include "../../mk/bsd.prefs.mk"
67.include "bootstrap.mk" 67.include "bootstrap.mk"
68.include "icedtea-extras.mk" 68.include "icedtea-extras.mk"
69 69
70SUBST_CLASSES+= add-rpaths 70SUBST_CLASSES+= add-rpaths
71SUBST_STAGE.add-rpaths= pre-build 71SUBST_STAGE.add-rpaths= pre-build
72SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles 72SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles
73SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \ 73SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \
74 jdk/make/sun/awt/mawt.gmk \ 74 jdk/make/sun/awt/mawt.gmk \
75 jdk/make/sun/jawt/Makefile \ 75 jdk/make/sun/jawt/Makefile \