Sync ps2pkm with TeX Live 2013

Changes:
- Pretend that the first pixel of an empty glyph is white; avoid using
  uninitialized data.
- Code cleanup.

3 files changed, 8 insertions, 37 deletions

diff --git a/fonts/ps2pkm/Makefile b/fonts/ps2pkm/Makefile
index 788b78e6d85..8bce2ab828e 100644
--- a/fonts/ps2pkm/Makefile
+++ b/fonts/ps2pkm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 18:28:29 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/12/04 03:35:27 minskim Exp $
 
-DISTNAME=	texlive-20110705-source
+DISTNAME=	texlive-20130530-source
 PKGNAME=	ps2pkm-1.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2013/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/fonts/ps2pkm/distinfo b/fonts/ps2pkm/distinfo
index 454c09b0185..f7fea0245fe 100644
--- a/fonts/ps2pkm/distinfo
+++ b/fonts/ps2pkm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/04/26 15:18:55 minskim Exp $
+$NetBSD: distinfo,v 1.7 2013/12/04 03:35:27 minskim Exp $
 
-SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
-RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
-Size (texlive-20110705-source.tar.xz) = 131207904 bytes
+SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
+RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
+Size (texlive-20130530-source.tar.xz) = 179963948 bytes
 SHA1 (patch-type1.c) = bb51988a641764440cb66b14d1e68c748e83e572
diff --git a/fonts/ps2pkm/patches/patch-type1.c b/fonts/ps2pkm/patches/patch-type1.c
deleted file mode 100644
index cbdc7d54db5..00000000000
--- a/fonts/ps2pkm/patches/patch-type1.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-type1.c,v 1.1 2012/04/26 15:18:55 minskim Exp $
-
-The Error macro doesn't return a value, but PSFakePop() should return
-a DOUBLE. gcc seems to accept this, clang does not.
-
---- type1.c.orig	2012-04-26 13:37:31.000000000 +0000
-+++ type1.c
-@@ -125,8 +125,12 @@ int currentchar = -1; /* for error repor
- #define CC IfTrace1(TRUE, "'%03o ", currentchar)
- 
- #define Error {errflag = TRUE; return;}
-+
-+#define Error_rd {errflag = TRUE; return 0.0;}
-  
- #define Error0(errmsg) { CC; IfTrace0(TRUE, errmsg); Error;}
-+
-+#define Error0_rd(errmsg) { CC; IfTrace0(TRUE, errmsg); Error_rd;}
-  
- #define Error1(errmsg,arg) { CC; IfTrace1(TRUE, errmsg, arg); Error;}
-  
-@@ -780,7 +784,7 @@ static void PSFakePush(Num)
- static DOUBLE PSFakePop ()
- {
-   if (PSFakeTop >= 0) return(PSFakeStack[PSFakeTop--]);
--  else Error0("PSFakePop : Stack empty\n");
-+  else Error0_rd("PSFakePop : Stack empty\n");
-   /*NOTREACHED*/
- }
-