Date: Thu, 18 Dec 2003 01:54:48 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: woju@freebsd.ntu.edu.tw Subject: ports/60343: fix port: chinese/ve Message-ID: <20031217175448.B8DA03EA213@utopia.leeym.com> Resent-Message-ID: <200312171800.hBHI0XAx010004@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60343 >Category: ports >Synopsis: fix port: chinese/ve >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Dec 17 10:00:33 PST 2003 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 5.2-RC i386 >Organization: >Environment: System: FreeBSD utopia.leeym.com 5.2-RC FreeBSD 5.2-RC #4: Tue Dec 16 05:13:28 CST 2003 root@utopia.leeym.com:/mnt3/obj/usr/src/sys/UTOPIA i386 >Description: minor fixes: + add extrapatch-screen.c and unbreak this port on -current + respect BSD_INSTALL_* macros + reduce the size of pkg-descr Cc-ed the to MAINTAINER. >How-To-Repeat: http://bento.freebsd.org/errorlogs/i386-5-latest/zh-ve-1.0.log >Fix: --- ve.diff begins here --- diff -ruN --exclude CVS /usr/ports/chinese/ve/Makefile ve/Makefile --- /usr/ports/chinese/ve/Makefile Sun Dec 7 07:18:17 2003 +++ ve/Makefile Thu Dec 18 01:30:41 2003 @@ -18,7 +18,7 @@ .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (need to replace varargs.h with stdarg.h)" +EXTRA_PATCHES= ${FILESDIR}/extrapatch-screen.c .endif .include <bsd.port.post.mk> diff -ruN --exclude CVS /usr/ports/chinese/ve/files/extrapatch-screen.c ve/files/extrapatch-screen.c --- /usr/ports/chinese/ve/files/extrapatch-screen.c Thu Jan 1 08:00:00 1970 +++ ve/files/extrapatch-screen.c Thu Dec 18 01:09:59 2003 @@ -0,0 +1,28 @@ +--- screen.c.orig Thu Dec 18 01:08:35 2003 ++++ screen.c Thu Dec 18 01:09:44 2003 +@@ -6,7 +6,7 @@ + /* update : 95/12/15 */ + /*-------------------------------------------------------*/ + +-#include <varargs.h> ++#include <stdarg.h> + #include "bbs.h" + + extern char clearbuf[]; +@@ -601,13 +601,12 @@ + + + void +-prints(va_alist) +-va_dcl ++prints(char *fmt, ...) + { + va_list args; +- char buff[512], *fmt; ++ char buff[512]; + +- va_start(args); ++ va_start(args, fmt); + fmt = va_arg(args, char *); + vsprintf(buff, fmt, args); + va_end(args); diff -ruN --exclude CVS /usr/ports/chinese/ve/files/patch-Makefile ve/files/patch-Makefile --- /usr/ports/chinese/ve/files/patch-Makefile Thu Oct 23 07:46:06 2003 +++ ve/files/patch-Makefile Thu Dec 18 01:30:18 2003 @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Oct 22 16:44:56 2003 -+++ Makefile Wed Oct 22 16:45:37 2003 +--- Makefile.orig Wed Aug 25 14:27:23 1999 ++++ Makefile Thu Dec 18 01:29:56 2003 @@ -1,10 +1,11 @@ -CC = gcc +CC ?= cc @@ -14,8 +14,16 @@ LIBS = -ltermcap -lcompat #---------------------------------------------------------- -@@ -31,7 +32,7 @@ - cp 00readme.txt ve.hlp /usr/local/share/ve +@@ -26,12 +27,12 @@ + rm -f *.o ve entab + + install: all +- mkdir -p /usr/local/share/ve +- cp ve /usr/local/bin +- cp 00readme.txt ve.hlp /usr/local/share/ve ++ mkdir -p $(PREFIX)/share/ve ++ $(BSD_INSTALL_PROGRAM) ve $(PREFIX)/bin ++ $(BSD_INSTALL_DATA) 00readme.txt ve.hlp $(PREFIX)/share/ve ve: $(OBJ) - gcc $(CFLAGS) -o ve $(OBJ) $(LIBS) diff -ruN --exclude CVS /usr/ports/chinese/ve/pkg-descr ve/pkg-descr --- /usr/ports/chinese/ve/pkg-descr Wed Sep 1 02:12:42 1999 +++ ve/pkg-descr Thu Dec 18 01:47:54 2003 @@ -18,15 +18,3 @@ The most obvious weakness of ve is changing TABs into Spaces. So please don't use ve to edit TAB-important files, such as Makefile, sendmail.cf, syslog.conf... etc. - -Manual -- -ve.hlp: less -r ve.hlp - -About TAB/SPACE -diff -b f.orig f.new -or "-durb" - -man expand/unexpand - -See Also -- -ports/chinese/big5con --- ve.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031217175448.B8DA03EA213>