pcf2bdf: update to 1.06.

pkgsrc changes:

- Upstream moved to GitHub
- Add missing LICENSE marker
- Stop patching Makefile.gcc and use a do-build target instead

ChangeLog:

1.06:

- Fixed: too-long-path-to-input.pcf.gz causes stack-based buffer overflow.

1.05:

- The size should come from POINT_SIZE instead of PIXEL_SIZE.
- Internal quotation characters in a string property should be indicated
  (or "quoted") by using two quotation characters in a row.
- Fix avoid crash with large compressed metrics tables. (Colin Watson)
- Fix support gzipped source. (Colin Watson)
- Fix use C++ compiler and simplify using GNU extensions. (Jonas Smedegaard)
- Other fixes.

4 files changed, 22 insertions, 61 deletions

diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 12e63583e34..2670122e7d5 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.15 2017/09/03 08:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2020/03/07 22:51:40 fcambus Exp $
 #
 
-DISTNAME=	pcf2bdf-1.04
-PKGREVISION=	1
+DISTNAME=	pcf2bdf-1.06
 CATEGORIES=	fonts graphics x11
-#MASTER_SITES=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ganaware/}
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
-#HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
+HOMEPAGE=	https://github.com/ganaware/pcf2bdf
 COMMENT=	Convert X font from PCF to BDF
+LICENSE=	mit
 
-WRKSRC=		${WRKDIR}
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 MAKE_FILE=	Makefile.gcc
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+do-build:
+	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o pcf2bdf pcf2bdf.cc
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pcf2bdf ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man \
diff --git a/fonts/pcf2bdf/distinfo b/fonts/pcf2bdf/distinfo
index 0fe8e8f9009..d13e65ed4c7 100644
--- a/fonts/pcf2bdf/distinfo
+++ b/fonts/pcf2bdf/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:44:38 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/03/07 22:51:40 fcambus Exp $
 
-SHA1 (pcf2bdf-1.04.tgz) = 6fdcc10132e27d3c26ff7e4be541332ee5d4e927
-RMD160 (pcf2bdf-1.04.tgz) = 6ded73f6610673b136a751c67ec8b8423ad0d87a
-SHA512 (pcf2bdf-1.04.tgz) = dc8329047ec8529410fdb4e15cbf409293b31ed7d50a2f6771a17c0abef3c393f2566590eca133856abefd03b09247859c4e055368e9c19e20972ab2e30991b5
-Size (pcf2bdf-1.04.tgz) = 9686 bytes
-SHA1 (patch-aa) = d750333e3ac74db0666a40a6902af02d85d02ba0
-SHA1 (patch-ab) = 570763e32397296c67a88a485171b898b70247ff
+SHA1 (pcf2bdf-1.06.tar.gz) = f0c65f9300388a3c115aa7e36016ea68cfe5a313
+RMD160 (pcf2bdf-1.06.tar.gz) = 35706bf155d2db66fda2ca5ef1ae54f1d939f77e
+SHA512 (pcf2bdf-1.06.tar.gz) = a8e9f0a6ff6458d0dac63019ffd712504c226ba216c5454bddd7164907e4a53004e4c5d2686fdba24d5ecf802c4a7aa682770beec205224e057d605cae2cb6f4
+Size (pcf2bdf-1.06.tar.gz) = 10781 bytes
+SHA1 (patch-aa) = 57faca2a593b407045798f5cf3d57f0788e62f1c
diff --git a/fonts/pcf2bdf/patches/patch-aa b/fonts/pcf2bdf/patches/patch-aa
index 037f6997bd6..cb2b25bdd34 100644
--- a/fonts/pcf2bdf/patches/patch-aa
+++ b/fonts/pcf2bdf/patches/patch-aa
@@ -1,31 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/31 05:44:43 kei Exp $
+$NetBSD: patch-aa,v 1.2 2020/03/07 22:51:40 fcambus Exp $
 
---- pcf2bdf.cc.orig	Mon Oct 21 01:35:29 2002
-+++ pcf2bdf.cc	Tue Dec 31 14:36:08 2002
-@@ -577,7 +577,7 @@
+--- pcf2bdf.cc.orig	2019-08-27 14:36:28.000000000 +0000
++++ pcf2bdf.cc
+@@ -655,7 +655,7 @@ int main(int argc, char *argv[])
    }
    if (ifilename)
    {
 -    ifp = fopen(ifilename, "rb");
 +    ifp = fopen(ifilename, "r");
      if (!ifp)
+     {
        return error_exit("failed to open input pcf file");
-   }
-@@ -595,7 +595,7 @@
-     fclose(ifp);
-     char buf[1024];
-     sprintf(buf, "gzip -dc %s", ifilename); // TODO
--    ifp = popen(buf, "rb");
-+    ifp = popen(buf, "r");
-     _setmode(fileno(ifp), O_BINARY);
-     read_bytes = 0;
-     if (!ifp)
-@@ -604,7 +604,7 @@
-   
+@@ -689,7 +689,7 @@ int main(int argc, char *argv[])
+ 
    if (ofilename)
    {
 -    ofp = fopen(ofilename, "wb");
 +    ofp = fopen(ofilename, "w");
      if (!ofp)
+     {
        return error_exit("failed to open output bdf file");
-   }
diff --git a/fonts/pcf2bdf/patches/patch-ab b/fonts/pcf2bdf/patches/patch-ab
deleted file mode 100644
index 4139f564d7f..00000000000
--- a/fonts/pcf2bdf/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/06/15 13:35:20 grant Exp $
-
---- Makefile.gcc.orig	2002-10-21 03:17:00.000000000 +1000
-+++ Makefile.gcc
-@@ -1,16 +1,20 @@
- # Makefile for pcf2bdf (gcc)  -*- makefile -*-
- 
--CC		= gcc
--CFLAGS		= -Wall -O2
--CXX		= $(CC)
--CXXFLAGS	= $(CFLAGS)
--PREFIX		= /usr/local
-+#CC		= gcc
-+#CFLAGS		= -Wall -O2
-+#CXX		= g++
-+#CXXFLAGS	= $(CFLAGS)
-+#PREFIX		= /usr/local
- BINPATH		= $(PREFIX)/bin
- MANPATH		= $(PREFIX)/man/man1
- 
- all:		pcf2bdf
- 
- pcf2bdf:	pcf2bdf.o
-+	${CXX} -o pcf2bdf pcf2bdf.o
-+
-+pcf2bdf.o: pcf2bdf.cc
-+	${CXX} ${CXXFLAGS} -c pcf2bdf.cc
- 
- clean:
- 	-$(RM) pcf2bdf pcf2bdf.exe pcf2bdf.o *~