From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 16 18:10:29 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C0F58E8 for ; Mon, 16 Dec 2013 18:10:29 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE8C31A00 for ; Mon, 16 Dec 2013 18:10:28 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIASHZ016646 for ; Mon, 16 Dec 2013 18:10:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBGIAShL016645; Mon, 16 Dec 2013 18:10:28 GMT (envelope-from gnats) Resent-Date: Mon, 16 Dec 2013 18:10:28 GMT Resent-Message-Id: <201312161810.rBGIAShL016645@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 865223D9 for ; Mon, 16 Dec 2013 18:04:57 +0000 (UTC) Received: from omta03.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145]) by mx1.freebsd.org (Postfix) with ESMTP id 4872F188E for ; Mon, 16 Dec 2013 18:04:57 +0000 (UTC) Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106]) by omta03.auone-net.jp (au one net mail) with ESMTP id 112B91880009 for ; Tue, 17 Dec 2013 03:04:53 +0900 (JST) Message-Id: <20131217024955.5a0f8c59a1a9dbcd3560bf7f@yahoo.com> Date: Tue, 17 Dec 2013 02:49:55 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184900: japanese/prn: Fix build with clang X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:10:29 -0000 >Number: 184900 >Category: ports >Synopsis: japanese/prn: Fix build with clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 16 18:10:28 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build with clang New file: files/patch-defs.c files/patch-euc.c files/patch-psconv.c >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/prn/Makefile japanese/prn/Makefile --- /usr/ports/japanese/prn/Makefile 2013-11-06 21:58:40.000000000 +0900 +++ japanese/prn/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -3,19 +3,28 @@ PORTNAME= prn PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= japanese print MASTER_SITES= ${MASTER_SITE_PORTS_JP} DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -COMMENT= A yet another converter from text file to postscript (with Japanese support) +COMMENT= Yet another converter from text file to postscript (with Japanese support) RUN_DEPENDS= kcc:${PORTSDIR}/japanese/kcc -INSTALL_TARGET= install install.man -MANLANG= ja -MAN1= prn.1 cprn.1 cmt.1 psconv.1 -MAN5= cmtdefs.5 +do-install: +.for i in cmt prn psconv + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin) +.endfor + ${LN} -sf prn ${STAGEDIR}${PREFIX}/bin/cprn + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} cmtdefs ${STAGEDIR}${DATADIR}) +.for i in cmt cprn prn psconv + (cd ${WRKSRC} && ${INSTALL_MAN} ${i}.jman \ + ${STAGEDIR}${MANPREFIX}/man/man1/${i}.1) +.endfor + (cd ${WRKSRC} && ${INSTALL_MAN} cmtdefs.jman \ + ${STAGEDIR}${MAN5PREFIX}/man/man5/cmtdefs.5) -NO_STAGE= yes .include diff -urN /usr/ports/japanese/prn/files/patch-aa japanese/prn/files/patch-aa --- /usr/ports/japanese/prn/files/patch-aa 2013-11-06 21:58:40.000000000 +0900 +++ japanese/prn/files/patch-aa 2013-12-17 00:00:00.000000000 +0900 @@ -19,10 +19,10 @@ ! PREFIX?=/usr/local ! BINPATH = ${PREFIX}/bin -! LIBPATH = ${PREFIX}/lib/prn +! LIBPATH = ${PREFIX}/share/prn ! MANPATH = ${PREFIX}/man ! JMANDIR = ja -! CFLAGS = -O \ +! CFLAGS += \ ! -DKCCPATH=\"${PREFIX}/bin/kcc\" \ ! -DCMTPATH=\"${PREFIX}/bin/cmt\" \ ! -DPSPATH=\"${PREFIX}/bin/psconv\" diff -urN /usr/ports/japanese/prn/files/patch-cmt.c japanese/prn/files/patch-cmt.c --- /usr/ports/japanese/prn/files/patch-cmt.c 2013-11-06 21:58:40.000000000 +0900 +++ japanese/prn/files/patch-cmt.c 2013-12-17 00:00:00.000000000 +0900 @@ -1,6 +1,16 @@ --- cmt.c.orig Mon Apr 25 16:26:57 1994 +++ cmt.c Fri Feb 6 00:18:46 2004 -@@ -352,16 +352,15 @@ +@@ -27,7 +27,9 @@ + #endif + + #include ++#include + #include ++#include + #include + #include + #include "cmt.h" +@@ -352,16 +354,15 @@ error(format, arg1, arg2, ...) char *format; ---------------------------------------------------------------------*/ diff -urN /usr/ports/japanese/prn/files/patch-defs.c japanese/prn/files/patch-defs.c --- /usr/ports/japanese/prn/files/patch-defs.c 1970-01-01 09:00:00.000000000 +0900 +++ japanese/prn/files/patch-defs.c 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- defs.c.orig ++++ defs.c +@@ -26,6 +26,7 @@ + #endif + + #include ++#include + #include + #include "euc.h" + #include "cmt.h" diff -urN /usr/ports/japanese/prn/files/patch-euc.c japanese/prn/files/patch-euc.c --- /usr/ports/japanese/prn/files/patch-euc.c 1970-01-01 09:00:00.000000000 +0900 +++ japanese/prn/files/patch-euc.c 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,12 @@ +--- euc.c.orig ++++ euc.c +@@ -26,6 +26,9 @@ + #endif + + #include ++#include ++#include ++#include + #include "euc.h" + + #if defined EUC diff -urN /usr/ports/japanese/prn/files/patch-prn.c japanese/prn/files/patch-prn.c --- /usr/ports/japanese/prn/files/patch-prn.c 2013-11-06 21:58:40.000000000 +0900 +++ japanese/prn/files/patch-prn.c 2013-12-17 00:00:00.000000000 +0900 @@ -1,7 +1,18 @@ --- prn.c.orig Thu May 26 11:37:45 1994 +++ prn.c Fri Feb 6 00:18:11 2004 -@@ -34,8 +34,13 @@ +@@ -26,16 +26,24 @@ + #endif + + #include ++#include + #include + #include + #include + #include ++#include + #include #include ++#include #include "euc.h" +#if !defined KCCPATH @@ -15,7 +26,7 @@ #define LPRPATH "/usr/bin/lpr" #else #define LPRPATH "/usr/ucb/lpr" -@@ -48,8 +53,12 @@ +@@ -48,8 +56,12 @@ #else @@ -28,7 +39,7 @@ #endif -@@ -96,7 +105,7 @@ +@@ -96,7 +108,7 @@ static char *filename; /* name of the file being processed */ static char *modtime; /* the last modification time */ @@ -37,7 +48,7 @@ static char *basename(); static bool formatopt(); static bool rangeopt(); -@@ -498,16 +507,15 @@ +@@ -498,16 +510,15 @@ error(format, arg1, arg2, ...) char *format; ---------------------------------------------------------------------*/ diff -urN /usr/ports/japanese/prn/files/patch-psconv.c japanese/prn/files/patch-psconv.c --- /usr/ports/japanese/prn/files/patch-psconv.c 1970-01-01 09:00:00.000000000 +0900 +++ japanese/prn/files/patch-psconv.c 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,14 @@ +--- psconv.c.orig ++++ psconv.c +@@ -64,9 +64,11 @@ + */ + + #include ++#include + #include + #include + #include ++#include + #include + #include + diff -urN /usr/ports/japanese/prn/files/patch-reg.y japanese/prn/files/patch-reg.y --- /usr/ports/japanese/prn/files/patch-reg.y 2013-11-06 21:58:40.000000000 +0900 +++ japanese/prn/files/patch-reg.y 2013-12-17 00:00:00.000000000 +0900 @@ -1,12 +1,19 @@ --- reg.y.org Mon Nov 29 18:43:56 1993 +++ reg.y Thu Jan 20 12:29:44 2005 -@@ -286,7 +286,7 @@ +@@ -20,6 +20,7 @@ + #endif + + #include ++#include + #include + #include "cmt.h" + #include "euc.h" +@@ -286,7 +287,7 @@ * Node Creation Functions * * * **********************************************************************/ -extern void error(); +extern void error(char *, ...); - /*--------------------------------------------------------------------- NAME diff -urN /usr/ports/japanese/prn/pkg-plist japanese/prn/pkg-plist --- /usr/ports/japanese/prn/pkg-plist 2013-11-06 21:58:40.000000000 +0900 +++ japanese/prn/pkg-plist 2013-12-17 00:00:00.000000000 +0900 @@ -1,6 +1,11 @@ -bin/prn -bin/cprn bin/cmt +bin/cprn +bin/prn bin/psconv -lib/prn/cmtdefs -@dirrm lib/prn +man/man1/cmt.1.gz +man/man1/cprn.1.gz +man/man1/prn.1.gz +man/man1/psconv.1.gz +man/man5/cmtdefs.5.gz +%%DATADIR%%/cmtdefs +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: