[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Substitute %%PREFIX%% in patch-ap, too.

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a8dda47829f
branches:  trunk
changeset: 400491:1a8dda47829f
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Oct 21 10:35:09 2009 +0000

description:
Substitute %%PREFIX%% in patch-ap, too.

diffstat:

 lang/openjdk7/Makefile         |   3 ++-
 lang/openjdk7/distinfo         |   4 ++--
 lang/openjdk7/patches/patch-ap |  14 +++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r 1fe77cae4a88 -r 1a8dda47829f lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Wed Oct 21 10:31:46 2009 +0000
+++ b/lang/openjdk7/Makefile    Wed Oct 21 10:35:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/10/21 10:31:46 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2009/10/21 10:35:09 ghen Exp $
 
 DISTNAME=      openjdk-7-ea-src-b72-17_sep_2009
 PKGNAME=       openjdk7-1.7.0.72.20090924
@@ -87,6 +87,7 @@
 SUBST_STAGE.fontpaths=         pre-build
 SUBST_MESSAGE.fontpaths=       fixing font paths
 SUBST_FILES.fontpaths=         jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
+SUBST_FILES.fontpaths+=                jdk/src/solaris/native/sun/awt/fontpath.c
 SUBST_SED.fontpaths=           -e 's|%%PREFIX%%|${PREFIX}|'
 
 PLIST_VARS+=   i386
diff -r 1fe77cae4a88 -r 1a8dda47829f lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Wed Oct 21 10:31:46 2009 +0000
+++ b/lang/openjdk7/distinfo    Wed Oct 21 10:35:09 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/10/21 10:31:46 ghen Exp $
+$NetBSD: distinfo,v 1.4 2009/10/21 10:35:09 ghen Exp $
 
 SHA1 (openjdk7/175529fae103.tar.bz2) = 297f474423a18d727a87b922b1665ea4e5d54732
 RMD160 (openjdk7/175529fae103.tar.bz2) = 37bb512ccce29eb764a6bf9649c13715bf3eb2d6
@@ -52,7 +52,7 @@
 SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
-SHA1 (patch-ap) = 1497019265bf524575d0cf78ca095166ac313318
+SHA1 (patch-ap) = 4219c2eb348603ee7ebcfad0b3e6dca81b942c91
 SHA1 (patch-aq) = 4cd70c3451eef29d21d1d562cb5f29fbf639631c
 SHA1 (patch-ar) = 19abc4c858c730fb337d68d1d524db82c73ffa36
 SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f
diff -r 1fe77cae4a88 -r 1a8dda47829f lang/openjdk7/patches/patch-ap
--- a/lang/openjdk7/patches/patch-ap    Wed Oct 21 10:31:46 2009 +0000
+++ b/lang/openjdk7/patches/patch-ap    Wed Oct 21 10:35:09 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ap,v 1.2 2009/10/21 10:35:09 ghen Exp $
 
 --- jdk/src/solaris/native/sun/awt/fontpath.c.orig     2009-01-10 14:29:12.000000000 +0100
 +++ jdk/src/solaris/native/sun/awt/fontpath.c
@@ -7,12 +7,12 @@
  };
  #endif
 +static char *pkgsrcFontPath[] = {
-+   "/usr/pkg/lib/X11/fonts/100dpi",
-+   "/usr/pkg/lib/X11/fonts/75dpi",
-+   "/usr/pkg/lib/X11/fonts/Type1",
-+   "/usr/pkg/lib/X11/fonts/cyrillic",
-+   "/usr/pkg/lib/X11/fonts/misc",
-+   "/usr/pkg/lib/X11/fonts/TTF",
++   "%%PREFIX%%/lib/X11/fonts/100dpi",
++   "%%PREFIX%%/lib/X11/fonts/75dpi",
++   "%%PREFIX%%/lib/X11/fonts/Type1",
++   "%%PREFIX%%/lib/X11/fonts/cyrillic",
++   "%%PREFIX%%/lib/X11/fonts/misc",
++   "%%PREFIX%%/lib/X11/fonts/TTF",
 +   "/usr/X11R7/lib/X11/fonts/100dpi",
 +   "/usr/X11R7/lib/X11/fonts/75dpi",
 +   "/usr/X11R7/lib/X11/fonts/Type1",