ports/184208: fix plain2 build failure

[Tsurutani Naoki]

>Number:         184208
>Category:       ports
>Synopsis:       fix plain2 build failure
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 24 05:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 8.4-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD h116.65.226.10.32118.vlan.kuins.net 8.4-PRERELEASE FreeBSD 8.4-PRERELEASE #1 r249390: Thu May 2 17:05:06 JST 2013 turutani at h116.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER13 amd64


	
>Description:
	I received a mail from pkg-fallout at freebsd.org about errors in
	building japanese/plain2.
	
>How-To-Repeat:
	
>Fix:
	Here is a patch.
	I found no problem while using stage, and enebling it.

diff -urN plain2.orig/Makefile plain2/Makefile
--- plain2.orig/Makefile	2013-09-21 03:47:54.000000000 +0900
+++ plain2/Makefile	2013-11-24 14:07:45.000000000 +0900
@@ -22,19 +22,17 @@
 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} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
 .if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${DATADIR}
+	@${MKDIR} ${STAGEDIR}/${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${STAGEDIR}/${DATADIR}
 .endif
 
 .include <bsd.port.mk>
diff -urN plain2.orig/files/patch-src-Makefile plain2/files/patch-src-Makefile
--- plain2.orig/files/patch-src-Makefile	2012-07-14 22:54:48.000000000 +0900
+++ plain2/files/patch-src-Makefile	2013-11-24 13:57:56.000000000 +0900
@@ -1,6 +1,6 @@
 --- src/Makefile.orig	2011-10-01 00:07:58.000000000 +0900
 +++ src/Makefile	2011-10-01 00:08:17.000000000 +0900
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,9 @@
  
  DEFINES=-DKANJI -DPICTURE -DHTML
  
@@ -8,10 +8,11 @@
 -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 +33,8 @@
+@@ -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
diff -urN plain2.orig/files/patch-src-plain2.c plain2/files/patch-src-plain2.c
--- plain2.orig/files/patch-src-plain2.c	1970-01-01 09:00:00.000000000 +0900
+++ plain2/files/patch-src-plain2.c	2013-11-24 13:47:29.000000000 +0900
@@ -0,0 +1,19 @@
+--- 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
	


>Release-Note:
>Audit-Trail:
>Unformatted: