diff options
| -rw-r--r-- | lang/openjdk7/Makefile | 3 | ||||
| -rw-r--r-- | lang/openjdk7/distinfo | 6 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-ap | 22 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-bn | 40 |
4 files changed, 36 insertions, 35 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index e6a4b7620a5..e1bd88a00b9 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.65 2014/05/02 10:48:13 ryoon Exp $ +# $NetBSD: Makefile,v 1.66 2014/06/01 17:55:33 wiz Exp $ DISTNAME= openjdk-1.7.55-20140501 PKGNAME= openjdk7-1.7.55 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 453471e0a73..d68919857ac 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2014/05/03 02:59:47 obache Exp $ +$NetBSD: distinfo,v 1.46 2014/06/01 17:55:33 wiz Exp $ SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -76,7 +76,7 @@ SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175 SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503 -SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a +SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476 SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2 @@ -86,7 +86,7 @@ SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423 SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a -SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9 +SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620 SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 548718a351fe6159d3de4120cba90701c064ddda SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 diff --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap index 9507de022eb..cc339041933 100644 --- a/lang/openjdk7/patches/patch-ap +++ b/lang/openjdk7/patches/patch-ap @@ -1,10 +1,10 @@ -$NetBSD: patch-ap,v 1.5 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ap,v 1.6 2014/06/01 17:55:33 wiz Exp $ Use pkgsrc fontconfig. ---- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2013-05-29 03:57:58.000000000 +0000 +--- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2014-01-01 05:53:43.000000000 +0000 +++ jdk/src/solaris/native/sun/awt/fontpath.c -@@ -72,8 +72,8 @@ extern Display *awt_display; +@@ -73,8 +73,8 @@ extern Display *awt_display; #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1") #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig") #else @@ -15,17 +15,17 @@ Use pkgsrc fontconfig. #endif #define MAXFDIRS 512 /* Max number of directories that contain fonts */ -@@ -181,6 +181,27 @@ static char *fullLinuxFontPath[] = { +@@ -182,6 +182,27 @@ static char *fullLinuxFontPath[] = { NULL, /* terminates the list */ }; #endif +static char *pkgsrcFontPath[] = { -+ "@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", ++ "@PREFIX@/share/fonts/X11/100dpi", ++ "@PREFIX@/share/fonts/X11/75dpi", ++ "@PREFIX@/share/fonts/X11/Type1", ++ "@PREFIX@/share/fonts/X11/cyrillic", ++ "@PREFIX@/share/fonts/X11/misc", ++ "@PREFIX@/share/fonts/X11/TTF", + "/usr/X11R7/lib/X11/fonts/100dpi", + "/usr/X11R7/lib/X11/fonts/75dpi", + "/usr/X11R7/lib/X11/fonts/Type1", @@ -43,7 +43,7 @@ Use pkgsrc fontconfig. static char **getFontConfigLocations(); -@@ -545,6 +566,7 @@ static char *getPlatformFontPathChars(JN +@@ -551,6 +572,7 @@ static char *getPlatformFontPathChars(JN #else /* IF SOLARIS */ knowndirs = fullSolarisFontPath; #endif diff --git a/lang/openjdk7/patches/patch-bn b/lang/openjdk7/patches/patch-bn index b011ee6323b..b4af4cdefe1 100644 --- a/lang/openjdk7/patches/patch-bn +++ b/lang/openjdk7/patches/patch-bn @@ -1,8 +1,8 @@ -$NetBSD: patch-bn,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-bn,v 1.5 2014/06/01 17:55:33 wiz Exp $ Use pkgsrc fonts. ---- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2012-08-10 17:31:20.000000000 +0000 +--- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2014-01-01 05:53:43.000000000 +0000 +++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties @@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g @@ -12,28 +12,28 @@ Use pkgsrc fonts. -filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf -filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf -filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf -+filename.DejaVu_LGC_Sans=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans.ttf -+filename.DejaVu_LGC_Sans_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_LGC_Sans_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_LGC_Sans_Bold_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf ++filename.DejaVu_LGC_Sans=@PREFIX@/share/fonts/X11/TTF/DejaVuSans.ttf ++filename.DejaVu_LGC_Sans_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_LGC_Sans_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_LGC_Sans_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-BoldOblique.ttf -filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf -filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf -filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf -filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf -+filename.DejaVu_LGC_Sans_Mono=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_LGC_Sans_Mono_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf ++filename.DejaVu_LGC_Sans_Mono=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_LGC_Sans_Mono_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-BoldOblique.ttf -filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf -filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf -filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf -filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf -+filename.DejaVu_LGC_Serif=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif.ttf -+filename.DejaVu_LGC_Serif_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_LGC_Serif_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif-Italic.ttf -+filename.DejaVu_LGC_Serif_Bold_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif-BoldItalic.ttf ++filename.DejaVu_LGC_Serif=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif.ttf ++filename.DejaVu_LGC_Serif_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_LGC_Serif_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-Italic.ttf ++filename.DejaVu_LGC_Serif_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-BoldItalic.ttf -filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf @@ -41,9 +41,9 @@ Use pkgsrc fonts. -filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf -filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf -filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf -+filename.Sazanami_Gothic=@PREFIX@/lib/X11/fonts/TTF/sazanami-gothic.ttf -+filename.Sazanami_Mincho=@PREFIX@/lib/X11/fonts/TTF/sazanami-mincho.ttf -+filename.AR_PL_ShanHeiSun_Uni=@PREFIX@/lib/X11/fonts/TTF/uming.ttf -+filename.AR_PL_ZenKai_Uni=@PREFIX@/lib/X11/fonts/TTF/ukai.ttf -+filename.Baekmuk_Gulim=@PREFIX@/lib/X11/fonts/TTF/gulim.ttf -+filename.Baekmuk_Batang=@PREFIX@/lib/X11/fonts/TTF/batang.ttf ++filename.Sazanami_Gothic=@PREFIX@/share/fonts/X11/TTF/sazanami-gothic.ttf ++filename.Sazanami_Mincho=@PREFIX@/share/fonts/X11/TTF/sazanami-mincho.ttf ++filename.AR_PL_ShanHeiSun_Uni=@PREFIX@/share/fonts/X11/TTF/uming.ttf ++filename.AR_PL_ZenKai_Uni=@PREFIX@/share/fonts/X11/TTF/ukai.ttf ++filename.Baekmuk_Gulim=@PREFIX@/share/fonts/X11/TTF/gulim.ttf ++filename.Baekmuk_Batang=@PREFIX@/share/fonts/X11/TTF/batang.ttf |