diff options
| author | ghen <ghen> | 2009-10-21 10:35:09 +0000 |
|---|---|---|
| committer | ghen <ghen> | 2009-10-21 10:35:09 +0000 |
| commit | 67f6bdc5892de73546e7ec09a75704036c527f5b (patch) | |
| tree | 98db46e0589adbd498c7f0342663ab7217d5dc71 /lang/openjdk7 | |
| parent | 4038ecc990c93fa88befe7f922275c2e7885800b (diff) | |
| download | pkgsrc-67f6bdc5892de73546e7ec09a75704036c527f5b.tar.gz | |
Substitute %%PREFIX%% in patch-ap, too.
Diffstat (limited to 'lang/openjdk7')
| -rw-r--r-- | lang/openjdk7/Makefile | 3 | ||||
| -rw-r--r-- | lang/openjdk7/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-ap | 14 |
3 files changed, 11 insertions, 10 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index c11ba62aee3..f2a0b5ce8f5 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -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_CLASSES+= fontpaths 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 --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 34ef314d7c5..376025f57a1 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -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-aj) = e370b618f4417d5ca19164c8eb59075123179b5a 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 --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap index a8b02426b86..1ac9c8adf68 100644 --- a/lang/openjdk7/patches/patch-ap +++ b/lang/openjdk7/patches/patch-ap @@ -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 @@ $NetBSD: patch-ap,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $ }; #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", |