Date: Sun, 19 Oct 2003 01:45:43 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58221: Update port: japanese/plain2 Message-ID: <20031019014543.7eb3c0ea.tkato@prontomail.com> Resent-Message-ID: <200310181650.h9IGoLw8093815@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> 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 <stdio.h> + #include <ctype.h> +-#include <varargs.h> ++#include <stdarg.h> + #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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031019014543.7eb3c0ea.tkato>