- Update to 1.05

PR:		202858
Submitted by:	tkato432@yahoo.com

x11-fonts/pcf2bdf/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	pcf2bdf
-PORTVERSION=	1.04
+PORTVERSION=	1.05
 CATEGORIES=	x11-fonts
-MASTER_SITES=	GHC
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert X font from PCF to BDF
@@ -15,22 +13,12 @@ LICENSE=	MIT
 USE_GITHUB=	yes
 GH_ACCOUNT=	ganaware
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+MAKEFILE=	Makefile.gcc
+MAKE_ENV=	MANPATH="${MANPREFIX}/man/man1" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_DATA="${INSTALL_MAN}" \
+		INSTALL_DIR="${MKDIR}"
 
 PLIST_FILES=	bin/pcf2bdf man/man1/pcf2bdf.1.gz
 
-post-extract:
-	@${MKDIR} ${WRKSRC}
-	@${LN} -sf ../pcf2bdf.cc ${WRKSRC}/pcf2bdf.cc
-	@${LN} -sf ../pcf2bdf.man ${WRKSRC}/pcf2bdf.1
-
-do-build:
-	(cd ${WRKSRC} && ${CXX} ${CXXFLAGS} pcf2bdf.cc -o pcf2bdf)
-
-do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} pcf2bdf \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_MAN} pcf2bdf.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1)
-
 .include <bsd.port.mk>

x11-fonts/pcf2bdf/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pcf2bdf-1.04.tgz) = 64d37fa8c8f3db53034e746a04928c18fb3494a7091aa6b70141008a9e2e893e
-SIZE (pcf2bdf-1.04.tgz) = 9686
+SHA256 (ganaware-pcf2bdf-1.05_GH0.tar.gz) = b6c646e245ae0e2713b94bfc0cb62971114d8b1d2da7a9f13533b555a9730316
+SIZE (ganaware-pcf2bdf-1.05_GH0.tar.gz) = 10603

x11-fonts/pcf2bdf/files/patch-pcf2bdf.cc

@@ -1,6 +1,6 @@
---- pcf2bdf.cc.orig	Mon Oct 21 01:35:29 2002
-+++ pcf2bdf.cc	Mon Jan 20 23:11:46 2003
-@@ -577,7 +577,7 @@
+--- pcf2bdf.cc.orig	2015-05-18 02:55:57 UTC
++++ pcf2bdf.cc
+@@ -580,7 +580,7 @@ int main(int argc, char *argv[])
    }
    if (ifilename)
    {
@@ -9,17 +9,8 @@
      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 @@
-   
+@@ -607,7 +607,7 @@ int main(int argc, char *argv[])
+ 
    if (ofilename)
    {
 -    ofp = fopen(ofilename, "wb");