Attachment #160659 for bug #202858

View | Details | Raw Unified | Return to bug 202858
Collapse All | Expand All




# $FreeBSD: head/x11-fonts/pcf2bdf/Makefile 336895 2013-12-19 12:51:46Z danilo $

PORTNAME=	pcf2bdf
PORTVERSION=	1.05
CATEGORIES=	x11-fonts
MASTER_SITES=	GH
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Convert X font from PCF to BDF

USE_GITHUB=	yes
GH_ACCOUNT=	ganaware

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>

Lines 1-2 Link Here

(-)x11-fonts/pcf2bdf/distinfo (-2 / +2 lines)
1	SHA256 (pcf2bdf-1.04.tgz) = 64d37fa8c8f3db53034e746a04928c18fb3494a7091aa6b70141008a9e2e893e	1	SHA256 (ganaware-pcf2bdf-1.05_GH0.tar.gz) = b6c646e245ae0e2713b94bfc0cb62971114d8b1d2da7a9f13533b555a9730316
2	SIZE (pcf2bdf-1.04.tgz) = 9686	2	SIZE (ganaware-pcf2bdf-1.05_GH0.tar.gz) = 10603




     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 @@
   
   if (ofilename)

Return to bug 202858

Lines 2-11 Link Here

(-)x11-fonts/pcf2bdf/Makefile (-18 / +7 lines)
2	# $FreeBSD: head/x11-fonts/pcf2bdf/Makefile 336895 2013-12-19 12:51:46Z danilo $	2	# $FreeBSD: head/x11-fonts/pcf2bdf/Makefile 336895 2013-12-19 12:51:46Z danilo $
3		3
4	PORTNAME= pcf2bdf	4	PORTNAME= pcf2bdf
5	PORTVERSION= 1.04	5	PORTVERSION= 1.05
6	CATEGORIES= x11-fonts	6	CATEGORIES= x11-fonts
7	MASTER_SITES= GHC	7	MASTER_SITES= GH
8	EXTRACT_SUFX= .tgz
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Convert X font from PCF to BDF	10	COMMENT= Convert X font from PCF to BDF
Lines 15-36 Link Here
15	USE_GITHUB= yes	14	USE_GITHUB= yes
16	GH_ACCOUNT= ganaware	15	GH_ACCOUNT= ganaware
17		16
18	WRKSRC= ${WRKDIR}/${DISTNAME}	17	MAKEFILE= Makefile.gcc
		18	MAKE_ENV= MANPATH="${MANPREFIX}/man/man1" \
		19	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
		20	INSTALL_DATA="${INSTALL_MAN}" \
		21	INSTALL_DIR="${MKDIR}"
19		22
20	PLIST_FILES= bin/pcf2bdf man/man1/pcf2bdf.1.gz	23	PLIST_FILES= bin/pcf2bdf man/man1/pcf2bdf.1.gz
21		24
22	post-extract:
23	@${MKDIR} ${WRKSRC}
24	@${LN} -sf ../pcf2bdf.cc ${WRKSRC}/pcf2bdf.cc
25	@${LN} -sf ../pcf2bdf.man ${WRKSRC}/pcf2bdf.1
26
27	do-build:
28	(cd ${WRKSRC} && ${CXX} ${CXXFLAGS} pcf2bdf.cc -o pcf2bdf)
29
30	do-install:
31	(cd ${WRKSRC} && ${INSTALL_PROGRAM} pcf2bdf \
32	${STAGEDIR}${PREFIX}/bin)
33	(cd ${WRKSRC} && ${INSTALL_MAN} pcf2bdf.1 \
34	${STAGEDIR}${MANPREFIX}/man/man1)
35
36	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 9-23 Link Here

(-)x11-fonts/pcf2bdf/files/patch-pcf2bdf.cc (-9 lines)
9	if (!ifp)	9	if (!ifp)
10	return error_exit("failed to open input pcf file");	10	return error_exit("failed to open input pcf file");
11	}	11	}
12	@@ -595,7 +595,7 @@
13	fclose(ifp);
14	char buf[1024];
15	sprintf(buf, "gzip -dc %s", ifilename); // TODO
16	- ifp = popen(buf, "rb");
17	+ ifp = popen(buf, "r");
18	_setmode(fileno(ifp), O_BINARY);
19	read_bytes = 0;
20	if (!ifp)
21	@@ -604,7 +604,7 @@	12	@@ -604,7 +604,7 @@
22		13
23	if (ofilename)	14	if (ofilename)