From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 18 09:50:32 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD9F316A4C1 for ; Sat, 18 Oct 2003 09:50:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10B6643F75 for ; Sat, 18 Oct 2003 09:50:21 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9IGoLFY093816 for ; Sat, 18 Oct 2003 09:50:21 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9IGoLw8093815; Sat, 18 Oct 2003 09:50:21 -0700 (PDT) (envelope-from gnats) Resent-Date: Sat, 18 Oct 2003 09:50:21 -0700 (PDT) Resent-Message-Id: <200310181650.h9IGoLw8093815@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 135F216A4C2 for ; Sat, 18 Oct 2003 09:47:17 -0700 (PDT) Received: from hfep01.dion.ne.jp (hfep01.dion.ne.jp [203.181.105.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC74843F75 for ; Sat, 18 Oct 2003 09:47:15 -0700 (PDT) (envelope-from tkato@prontomail.com) Received: from localhost ([61.198.241.31]) by hfep01.dion.ne.jp with SMTP id <20031018164712965.CZBK@hfep01.dion.ne.jp> for ; Sun, 19 Oct 2003 01:47:12 +0900 Message-Id: <20031019014543.7eb3c0ea.tkato@prontomail.com> Date: Sun, 19 Oct 2003 01:45:43 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58221: Update port: japanese/plain2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Oct 2003 16:50:32 -0000 >Number: 58221 >Category: ports >Synopsis: Update port: japanese/plain2 >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: Sat Oct 18 09:50:21 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: >Environment: >Description: - Fix build on -current New file files/patch-src::macro.c >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/plain2/Makefile japanese/plain2/Makefile --- /usr/ports/japanese/plain2/Makefile Thu Oct 16 19:39:01 2003 +++ japanese/plain2/Makefile Sun Oct 19 01:37:08 2003 @@ -26,12 +26,6 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DBSD -DKANJI -DPICTURE -DHTML -fwritable-strings" ALL_TARGET= ${PORTNAME} -.include - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|/usr/lib/plain2|${DATADIR}|g' ${BUILD_WRKSRC}/plain2.h @@ -41,4 +35,4 @@ @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${DATADIR} -.include +.include diff -urN /usr/ports/japanese/plain2/files/patch-src::macro.c japanese/plain2/files/patch-src::macro.c --- /usr/ports/japanese/plain2/files/patch-src::macro.c Thu Jan 1 09:00:00 1970 +++ japanese/plain2/files/patch-src::macro.c Sun Oct 19 01:10:37 2003 @@ -0,0 +1,31 @@ +--- src/macro.c.orig Sat Oct 18 23:46:14 2003 ++++ src/macro.c Sat Oct 18 23:47:36 2003 +@@ -8,7 +8,7 @@ + + #include + #include +-#include ++#include + #include "plain2.h" + #include "macro.h" + +@@ -189,9 +189,7 @@ + buf++; + } + } +-putMacro(macroNum, va_alist) +-int macroNum; +-va_dcl ++putMacro(int macroNum, char *fmt, ...) + { + va_list ap; + union macroArg { +@@ -226,7 +224,7 @@ + } + mip = mip->cmac_next; + } +- va_start(ap); ++ va_start(ap, fmt); + for (i = 1; i <= maxarg; i++) { + switch(argtype[i]) { + case ATYPE_VOID: >Release-Note: >Audit-Trail: >Unformatted: