Attachment #138279 for bug #184208

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




PLIST_FILES=	bin/plain2
PORTDATA=	OHP.p2 OHP_t.p2 header.p2 header_t.p2 jbook.p2 supsnum.p2

CFLAGS+=	-DBSD -DKANJI -DPICTURE -DHTML
ALL_TARGET=	${PORTNAME}

NO_STAGE=	yes
post-patch:
	@${REINPLACE_CMD} -e \
		's|/usr/lib/plain2|${DATADIR}|g' ${BUILD_WRKSRC}/plain2.h

do-install:
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
.if !defined(NOPORTDATA)
	@${MKDIR} ${STAGEDIR}/${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${STAGEDIR}/${DATADIR}
.endif

.include <bsd.port.mk>




--- src/Makefile.orig	2011-10-01 00:07:58.000000000 +0900
+++ src/Makefile	2011-10-01 00:08:17.000000000 +0900
@@ -12,8 +12,9 @@
 
 DEFINES=-DKANJI -DPICTURE -DHTML
 

-CFLAGS= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s
+CC?=gcc
+CFLAGS?= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s
+CFLAGS+= ${DEFINES}
 
 #CC=cc
 #CFLAGS= -O -fwritable-strings ${DEFINES} -DBSD -DDEBUG
@@ -33,8 +34,8 @@
 OBJS_KANJI=roffout.o analyze.o table.o title.o picture.o ftitle.o
 
 HDRS=plain2.h table.h picture.h kanji.h




--- src/plain2.c.orig	2013-11-24 13:27:57.000000000 +0900
+++ src/plain2.c	2013-11-24 13:45:59.000000000 +0900
@@ -643,7 +643,7 @@
 	char	buf[MAX_LINE_LEN];
 	FILE	*initf;
 	if ((plainEnv = getenv(PLAIN2_ENV)) == NULL)
-		return;
+		return 0;
 	if ((initf = fopen(plainEnv, "r")) == NULL) {
 		char	envOpt[MAX_LINE_LEN];
 		strcpy(envOpt, plainEnv);
@@ -669,6 +669,7 @@
 		}
 		fclose(initf);
 	}
+	return 0;
 }
 /*
  * Save & Restore Parameters for Parsing

Return to bug 184208

Lines 22-40 Link Here

(-)plain2/Makefile (-5 / +3 lines)
22	PLIST_FILES= bin/plain2	22	PLIST_FILES= bin/plain2
23	PORTDATA= OHP.p2 OHP_t.p2 header.p2 header_t.p2 jbook.p2 supsnum.p2	23	PORTDATA= OHP.p2 OHP_t.p2 header.p2 header_t.p2 jbook.p2 supsnum.p2
24		24
25	CFLAGS+= -DBSD -DKANJI -DPICTURE -DHTML
26	ALL_TARGET= ${PORTNAME}	25	ALL_TARGET= ${PORTNAME}
27		26
28	NO_STAGE= yes
29	post-patch:	27	post-patch:
30	@${REINPLACE_CMD} -e \	28	@${REINPLACE_CMD} -e \
31	's\|/usr/lib/plain2\|${DATADIR}\|g' ${BUILD_WRKSRC}/plain2.h	29	's\|/usr/lib/plain2\|${DATADIR}\|g' ${BUILD_WRKSRC}/plain2.h
32		30
33	do-install:	31	do-install:
34	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin	32	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
35	.if !defined(NOPORTDATA)	33	.if !defined(NOPORTDATA)
36	@${MKDIR} ${DATADIR}	34	@${MKDIR} ${STAGEDIR}/${DATADIR}
37	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${DATADIR}	35	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${STAGEDIR}/${DATADIR}
38	.endif	36	.endif
39		37
40	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)plain2/files/patch-src-Makefile (-2 / +3 lines)
1	--- src/Makefile.orig 2011-10-01 00:07:58.000000000 +0900	1	--- src/Makefile.orig 2011-10-01 00:07:58.000000000 +0900
2	+++ src/Makefile 2011-10-01 00:08:17.000000000 +0900	2	+++ src/Makefile 2011-10-01 00:08:17.000000000 +0900
3	@@ -12,8 +12,8 @@	3	@@ -12,8 +12,9 @@
4		4
5	DEFINES=-DKANJI -DPICTURE -DHTML	5	DEFINES=-DKANJI -DPICTURE -DHTML
6		6
Lines 8-17 Link Here
8	-CFLAGS= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s	8	-CFLAGS= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s
9	+CC?=gcc	9	+CC?=gcc
10	+CFLAGS?= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s	10	+CFLAGS?= -fwritable-strings ${DEFINES} -DBSD -DDEBUG -O2 -s
		11	+CFLAGS+= ${DEFINES}
11		12
12	#CC=cc	13	#CC=cc
13	#CFLAGS= -O -fwritable-strings ${DEFINES} -DBSD -DDEBUG	14	#CFLAGS= -O -fwritable-strings ${DEFINES} -DBSD -DDEBUG
14	@@ -33,8 +33,8 @@	15	@@ -33,8 +34,8 @@
15	OBJS_KANJI=roffout.o analyze.o table.o title.o picture.o ftitle.o	16	OBJS_KANJI=roffout.o analyze.o table.o title.o picture.o ftitle.o
16		17
17	HDRS=plain2.h table.h picture.h kanji.h	18	HDRS=plain2.h table.h picture.h kanji.h

Line 0 Link Here

(-)plain2/files/patch-src-plain2.c (+19 lines)
	1	--- src/plain2.c.orig 2013-11-24 13:27:57.000000000 +0900
	2	+++ src/plain2.c 2013-11-24 13:45:59.000000000 +0900
	3	@@ -643,7 +643,7 @@
	4	char buf[MAX_LINE_LEN];
	5	FILE *initf;
	6	if ((plainEnv = getenv(PLAIN2_ENV)) == NULL)
	7	- return;
	8	+ return 0;
	9	if ((initf = fopen(plainEnv, "r")) == NULL) {
	10	char envOpt[MAX_LINE_LEN];
	11	strcpy(envOpt, plainEnv);
	12	@@ -669,6 +669,7 @@
	13	}
	14	fclose(initf);
	15	}
	16	+ return 0;
	17	}
	18	/*
	19	* Save & Restore Parameters for Parsing