Update to 4.0f

PR:		ports/4994
Submitted by:	Vanill I. Shu <vanilla@MinJe.com.TW>

6 files changed, 78 insertions, 120 deletions

diff --git a/chinese/ted/Makefile b/chinese/ted/Makefile
index bb0fec80a6ad..cf0da1048da3 100644
--- a/chinese/ted/Makefile
+++ b/chinese/ted/Makefile
@@ -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 <vanilla@MinJe.com.TW>
 #
-# $Id$
+# $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 @@ MAINTAINER=	vanilla@MinJe.com.TW
 
 USE_X11=	yes
 WRKSRC=		${WRKDIR}/ted
-MAKEFILE=	Makefile.b5
 
 .include <bsd.port.mk>
diff --git a/chinese/ted/distinfo b/chinese/ted/distinfo
index 25144a0c2281..9c1da4692920 100644
--- a/chinese/ted/distinfo
+++ b/chinese/ted/distinfo
@@ -1 +1 @@
-MD5 (ted3.6a.tgz) = 2914e6dc0e5b6c99bdf11ab724a679fa
+MD5 (ted4.0f.tgz) = e29133ab366713d857bf906bbda041bb
diff --git a/chinese/ted/files/patch-aa b/chinese/ted/files/patch-aa
index 2d26411b9848..e651031c6168 100644
--- a/chinese/ted/files/patch-aa
+++ b/chinese/ted/files/patch-aa
@@ -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 --git a/chinese/ted/files/patch-ab b/chinese/ted/files/patch-ab
index 7acbdb476951..a8ce29cc734c 100644
--- a/chinese/ted/files/patch-ab
+++ b/chinese/ted/files/patch-ab
@@ -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 --git a/chinese/ted/files/patch-ac b/chinese/ted/files/patch-ac
index 224dfa08eec8..ea4c7209048a 100644
--- a/chinese/ted/files/patch-ac
+++ b/chinese/ted/files/patch-ac
@@ -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 --git a/chinese/ted/pkg-plist b/chinese/ted/pkg-plist
index 8657696eb4d6..ed53d3da586d 100644
--- a/chinese/ted/pkg-plist
+++ b/chinese/ted/pkg-plist
@@ -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