From owner-freebsd-ports Sun Nov 9 17:50:09 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id RAA22662 for ports-outgoing; Sun, 9 Nov 1997 17:50:09 -0800 (PST) (envelope-from owner-freebsd-ports) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id RAA22650; Sun, 9 Nov 1997 17:50:02 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 9 Nov 1997 17:50:02 -0800 (PST) Resent-Message-Id: <199711100150.RAA22650@hub.freebsd.org> Resent-From: gnats (GNATS Management) Resent-To: freebsd-ports Resent-Reply-To: FreeBSD-gnats@FreeBSD.ORG, vanilla@MinJe.com.TW Received: from MinJe.com.TW (qmailr@ns.MinJe.com.TW [210.66.86.1]) by hub.freebsd.org (8.8.7/8.8.7) with SMTP id RAA22536 for ; Sun, 9 Nov 1997 17:48:06 -0800 (PST) (envelope-from vanilla@MinJe.com.TW) Received: (qmail 15656 invoked by uid 900); 10 Nov 1997 01:41:08 -0000 Message-Id: <19971110014108.15655.qmail@MinJe.com.TW> Date: 10 Nov 1997 01:41:08 -0000 From: vanilla@MinJe.com.TW Reply-To: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/4994: Update zh-ted to 4.0f Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >Number: 4994 >Category: ports >Synopsis: Update zh-ted to 4.0f >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 9 17:50:01 PST 1997 >Last-Modified: >Originator: Vanill I. Shu >Organization: Cray running FreeBSD >Release: FreeBSD 3.0-CURRENT i386 >Environment: 3.0C, XFree 3.3.1 >Description: Update zh-ted to 4.0f >How-To-Repeat: >Fix: diff -ruN ted.orig/Makefile ted/Makefile --- ted.orig/Makefile Wed Oct 1 17:34:48 1997 +++ ted/Makefile Mon Nov 10 09:38:07 1997 @@ -1,13 +1,13 @@ # New ports collection makefile for: ted -# Version required: 3.6a +# Version required: 4.0f # Date Created: 18 Sep 1997 # Whom: Vanilla I. Shu # # $Id: Makefile,v 1.1.1.1 1997/10/01 09:34:48 max Exp $ # -DISTNAME= ted3.6a -PKGNAME= zh-ted-3.6a +DISTNAME= ted4.0f +PKGNAME= zh-ted-4.0f CATEGORIES= chinese editors MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= editors/ @@ -17,6 +17,5 @@ USE_X11= yes WRKSRC= ${WRKDIR}/ted -MAKEFILE= Makefile.b5 .include diff -ruN ted.orig/files/md5 ted/files/md5 --- ted.orig/files/md5 Wed Oct 1 17:34:50 1997 +++ ted/files/md5 Sat Nov 8 05:36:09 1997 @@ -1 +1 @@ -MD5 (ted3.6a.tgz) = 2914e6dc0e5b6c99bdf11ab724a679fa +MD5 (ted4.0f.tgz) = e29133ab366713d857bf906bbda041bb diff -ruN ted.orig/patches/patch-aa ted/patches/patch-aa --- ted.orig/patches/patch-aa Wed Oct 1 17:34:49 1997 +++ ted/patches/patch-aa Mon Nov 10 09:39:10 1997 @@ -1,74 +1,47 @@ -*** Makefile.b5.orig Fri Sep 19 01:15:03 1997 ---- Makefile.b5 Fri Sep 19 01:18:22 1997 -*************** -*** 1,5 **** - CHINESE=1 -! TEDDIR=/usr/local/lib/Ted - ########## GCC/Linux ...... ############ - CC=gcc - CComp=GCC ---- 1,5 ---- - CHINESE=1 -! TEDDIR=/usr/X11R6/lib/X11/ted - ########## GCC/Linux ...... ############ - CC=gcc - CComp=GCC -*************** LDFLAGS= -L/usr/X11R6/lib -*** 27,41 **** - #SUNKBD=-DSUNKBD - ########################### - -! CFLAGS = -O -DCHINESE=$(CHINESE) -I$(XINC) -DCComp=$(CComp) $(SUNKBD) - #CFLAGS = -g -DCHINESE=$(CHINESE) -I$(XINC) -DCComp=$(CComp) -DDEBUG $(SUNKBD) - - OBJS = e.o x.o m.o f.o b.o edln.o xcp.o s.o u.o misc.o twin.o dir.o xkey.o \ - cwin.o filebrowse.o cli_xcin.o kwcomp.o - -! all: ted ref ctags - ted: $(OBJS) -! $(CC) -g $(OBJS) -o $@ $(LDFLAGS) -lX11 - # strip $@ - echo '*** Finish ***' - ref: ---- 27,41 ---- - #SUNKBD=-DSUNKBD - ########################### - -! CFLAGS += -DCHINESE=$(CHINESE) -I$(XINC) -DCComp=$(CComp) $(SUNKBD) - #CFLAGS = -g -DCHINESE=$(CHINESE) -I$(XINC) -DCComp=$(CComp) -DDEBUG $(SUNKBD) - - OBJS = e.o x.o m.o f.o b.o edln.o xcp.o s.o u.o misc.o twin.o dir.o xkey.o \ - cwin.o filebrowse.o cli_xcin.o kwcomp.o - -! all: ted #ref ctags - ted: $(OBJS) -! $(CC) $(OBJS) -o $@ $(LDFLAGS) -lX11 - # strip $@ - echo '*** Finish ***' - ref: -*************** ctags: -*** 45,55 **** - $(CC) $(CFLAGS) ctags.c -o $@ - strip $@ - install: -! cp ted ref ctags /usr/local/bin - if [ ! -d $(TEDDIR) ]; then mkdir $(TEDDIR); fi -! cp tedrc ted.help $(TEDDIR) -! cli_xcin.o: -! ln -s ../big5-pack/xcin/cli_xcin.o . - clean: - rm -f $(OBJS) ted core *~ *_ - clb5: ---- 45,56 ---- - $(CC) $(CFLAGS) ctags.c -o $@ - strip $@ - install: -! install -c -s -o bin -g bin -m 0755 ted /usr/X11R6/bin - if [ ! -d $(TEDDIR) ]; then mkdir $(TEDDIR); fi -! install -c -o bin -g bin -m 0555 tedrc $(TEDDIR) -! install -c -o bin -g bin -m 0555 ted.help $(TEDDIR) -! #cli_xcin.o: -! # ln -s ../big5-pack/xcin/cli_xcin.o . - clean: - rm -f $(OBJS) ted core *~ *_ - clb5: +--- Makefile.orig Mon Nov 3 18:48:59 1997 ++++ Makefile Mon Nov 10 09:36:00 1997 +@@ -1,5 +1,5 @@ +-CHINESE=0 +-TEDDIR=/usr/local/lib/Ted ++CHINESE=1 ++TEDDIR=/usr/X11R6/lib/X11/ted + ########## GCC/Linux ...... ############ + CC=gcc + XINC=-I/usr/X11R6/include +@@ -34,14 +34,14 @@ + #SUNKBD=-DSUNKBD + ########################### + +-CFLAGS = -O -DCHINESE=$(CHINESE) $(XINC) $(SUNKBD) -DTEDDIR=\"$(TEDDIR)\" ++CFLAGS += -DCHINESE=$(CHINESE) $(XINC) $(SUNKBD) -DTEDDIR=\"$(TEDDIR)\" + #CFLAGS = -g -DCHINESE=$(CHINESE) $(XINC) -DDEBUG $(SUNKBD) -DTEDDIR=\"$(TEDDIR)\" + #CFLAGS = -g -DCHINESE=$(CHINESE) $(XINC) $(SUNKBD) -DTEDDIR=\"$(TEDDIR)\" + + OBJS = e.o x.o m.o f.o b.o edln.o xcp.o s.o u.o misc.o twin.o dir.o xkey.o \ +- cwin.o filebrowse.o kwcomp.o ++ cwin.o filebrowse.o kwcomp.o cli_xcin.o + +-all: ted ref ctags tedrc ++all: ted tedrc #ref ctags tedrc + ted: $(OBJS) + $(CC) $(OBJS) -o $@ $(LDFLAGS) -lX11 + # $(CC) $(OBJS) -o $@ $(LDFLAGS) -lX11 -lefence +@@ -56,11 +56,14 @@ + $(CC) $(CFLAGS) ctags.c -o $@ + strip $@ + install: +- cp ted ref ctags /usr/local/bin ++ install -c -s -o bin -g bin -m 0755 ted /usr/X11R6/bin + if [ ! -d $(TEDDIR) ]; then mkdir $(TEDDIR); fi +- cp tedrc tedrc.vi tedrc.grep ted.help $(TEDDIR) +-cli_xcin.o: +- ln -s ../big5-pack/xcin/cli_xcin.o . ++ install -c -o bin -g bin -m 0444 tedrc $(TEDDIR) ++ install -c -o bin -g bin -m 0444 tedrc.vi $(TEDDIR) ++ install -c -o bin -g bin -m 0444 tedrc.grep $(TEDDIR) ++ install -c -o bin -g bin -m 0444 ted.help $(TEDDIR) ++#cli_xcin.o: ++# ln -s ../big5-pack/xcin/cli_xcin.o . + clean: + rm -f $(OBJS) ted core *~ *_ + clb5: diff -ruN ted.orig/patches/patch-ab ted/patches/patch-ab --- ted.orig/patches/patch-ab Wed Oct 1 17:34:49 1997 +++ ted/patches/patch-ab Mon Nov 10 09:36:37 1997 @@ -1,19 +1,11 @@ -*** xkey.c.orig Thu Sep 18 23:23:06 1997 ---- xkey.c Thu Sep 18 23:23:45 1997 -*************** if (cdtedrc && (fp=fopen(ftedrc,"r"))) { -*** 563,569 **** - if (fp=fopen( - strcat(strcat(strcpy(tt,(char *)getenv("HOME")),"/.Ted/"),ftedrc), "r" - )) return fp; -! if (fp=fopen(strcat(strcpy(uu,"/usr/local/lib/Ted/"),ftedrc),"r")) - return fp; - if (!depth) { - if (cdtedrc) ---- 563,569 ---- - if (fp=fopen( - strcat(strcat(strcpy(tt,(char *)getenv("HOME")),"/.Ted/"),ftedrc), "r" - )) return fp; -! if (fp=fopen(strcat(strcpy(uu,"/usr/X11R6/lib/X11/ted/"),ftedrc),"r")) - return fp; - if (!depth) { - if (cdtedrc) +--- xkey.c.orig Mon Nov 3 16:52:47 1997 ++++ xkey.c Mon Nov 10 09:34:52 1997 +@@ -602,7 +602,7 @@ + if (fp=fopen( + strcat(strcat(strcpy(tt,(char *)getenv("HOME")),"/.Ted/"),ftedrc), "r" + )) return fp; +-if (fp=fopen(strcat(strcat(strcpy(uu, TEDDIR),"/"),ftedrc),"r")) ++if (fp=fopen(strcat(strcat(strcpy(uu, "/usr/X11R6/lib/X11/ted/"),"/"),ftedrc),"r")) + return fp; + if (!depth) { + if (cdtedrc) diff -ruN ted.orig/patches/patch-ac ted/patches/patch-ac --- ted.orig/patches/patch-ac Wed Oct 1 17:34:49 1997 +++ ted/patches/patch-ac Mon Nov 10 09:36:50 1997 @@ -1,21 +1,13 @@ -*** tedrc.orig Thu Sep 18 23:24:10 1997 ---- tedrc Thu Sep 18 23:24:39 1997 -*************** f [a-f12] MergeTedrc("localtedrc") -*** 153,160 **** - f [s-f9] ExeCmdFnameExt("make",".o") - ## If the file is already open, switch to this file; otherwise - ## load the file -! f [f1] RaiseOrLoad("/usr/local/lib/Ted/ted.help") -! f [c-a][f1] RaiseOrLoad("/usr/local/lib/Ted/tedrc") - ## execute command and place the output in the current file - #f [c-q][s] InsPipe("ls") - # Excute command and and place output in a new file with name same as the command ---- 153,160 ---- - f [s-f9] ExeCmdFnameExt("make",".o") - ## If the file is already open, switch to this file; otherwise - ## load the file -! f [f1] RaiseOrLoad("/usr/X11R6/lib/X11/ted/ted.help") -! f [c-a][f1] RaiseOrLoad("/usr/X11R6/lib/X11/ted/tedrc") - ## execute command and place the output in the current file - #f [c-q][s] InsPipe("ls") - # Excute command and and place output in a new file with name same as the command +--- tedrc.vi.orig Sat Oct 11 13:37:55 1997 ++++ tedrc.vi Mon Nov 10 09:34:52 1997 +@@ -165,8 +165,8 @@ + f [s-f9] ExeCmdFnameExt("make",".o") + ## If the file is already open, switch to this file; otherwise + ## load the file +-f [f1] RaiseOrLoad("/usr/local/lib/Ted/ted.help") +-f [c-a][f1] RaiseOrLoad("/usr/local/lib/Ted/tedrc") ++f [f1] RaiseOrLoad("/usr/X11R6/lib/X11/ted/ted.help") ++f [c-a][f1] RaiseOrLoad("/usr/X11R6/lib/X11/ted/tedrc") + ## execute command and place the output in the current file + #f [c-q][s] InsPipe("ls") + # Excute command and and place output in a new file with name same as the command diff -ruN ted.orig/pkg/PLIST ted/pkg/PLIST --- ted.orig/pkg/PLIST Wed Oct 1 17:34:50 1997 +++ ted/pkg/PLIST Mon Nov 10 09:37:44 1997 @@ -1,4 +1,6 @@ bin/ted lib/X11/ted/ted.help lib/X11/ted/tedrc +lib/X11/ted/tedrc.vi +lib/X11/ted/tedrc.grep @dirrm lib/X11/ted >Audit-Trail: >Unformatted: