Update to 4.5. No changelog available, and diffs are extensive.

Many (most?) are to take more care with types and declarations.

7 files changed, 45 insertions, 190 deletions

diff --git a/editors/ce/Makefile b/editors/ce/Makefile
index 6520413ef87..32bb376a83a 100644
--- a/editors/ce/Makefile
+++ b/editors/ce/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/08 07:46:15 schmonz Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		2
 
 COMMENT+=		, tty version
 
diff --git a/editors/ce/Makefile.common b/editors/ce/Makefile.common
index 99dc74c5561..68f4ee01a5b 100644
--- a/editors/ce/Makefile.common
+++ b/editors/ce/Makefile.common
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile.common,v 1.4 2004/02/14 15:29:15 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/01/08 07:46:15 schmonz Exp $
 #
 
 DISTNAME=		ce-${VERSION}
-VERSION=		4.4
+VERSION=		4.5
 CATEGORIES=		editors
-MASTER_SITES=		http://cnswww.cns.cwru.edu/~chet/dist/ \
-			ftp://ftp.cwru.edu/pub/chet/
+MASTER_SITES=		http://cnswww.cns.cwru.edu/~chet/dist/
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://cnswww.cns.cwru.edu/php/chet/
 COMMENT=		Chet's Emacs: small, fast emacs-like editor
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--without-ce-malloc
 CONFIGURE_ARGS+=	--with-curses
diff --git a/editors/ce/distinfo b/editors/ce/distinfo
index 8e4a5f40858..ded7c6fb572 100644
--- a/editors/ce/distinfo
+++ b/editors/ce/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/07/28 17:24:28 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2005/01/08 07:46:15 schmonz Exp $
 
-SHA1 (ce-4.4.tar.gz) = f5ab8a5ff1e81212c020831675d3b06a4425fa3d
-Size (ce-4.4.tar.gz) = 207221 bytes
-SHA1 (patch-aa) = 4705b744bd5edbfb48fcbcdbfc56bc2970359089
-SHA1 (patch-ab) = 33aa1a7959d865f09f1e92fcc8d4941a8a13aefb
-SHA1 (patch-ac) = c95263dbddc2e19395cb7b74f709fdd9a9bb2afc
-SHA1 (patch-ad) = bb705fd400901b5fb512653342c031e5da6044d2
+SHA1 (ce-4.5.tar.gz) = 081f2f06097bc02044150d0681fcb3bb10a8862e
+Size (ce-4.5.tar.gz) = 242624 bytes
+SHA1 (patch-aa) = ff29933d850f2b4b3d1565a5c6c6242f7c55221b
+SHA1 (patch-ab) = 4c9cc4535ce750e84efc65ce9aed08581aa302d6
diff --git a/editors/ce/patches/patch-aa b/editors/ce/patches/patch-aa
index 9cbcbac0625..517ca58e080 100644
--- a/editors/ce/patches/patch-aa
+++ b/editors/ce/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/08 19:59:08 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2005/01/08 07:46:15 schmonz Exp $
 
---- Makefile.in.orig	Fri May 16 15:15:48 1997
+--- Makefile.in.orig	2001-11-07 12:20:44.000000000 -0500
 +++ Makefile.in
-@@ -51,6 +51,7 @@
+@@ -40,6 +40,7 @@ LPR =		lpr
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
  
- XLIBS=		-lX11
- LINTFLAGS=	-chx
-@@ -199,28 +200,31 @@
+ # could also be, e.g., `date +'%Y%m%d'`
+ OLDEXT = old
+@@ -232,29 +233,32 @@ backup:
  depend:
- 		makedepend -- $(CCFLAGS) -- $(CFILES)
+ 	makedepend -- $(CCFLAGS) -- $(CFILES)
  
 -installdirs:
 +install:	${PROG}
@@ -21,13 +21,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/08 19:59:08 schmonz Exp $
 -	@${SHELL} $(SUPPORT_SRC)/mkdirs $(DOCDIR)   
 -
 -install:	${PROG} ${XPROG} installdirs
--	$(RM) ${DESTDIR}/${PROG} ${DESTDIR}/${XPROG}
+-	$(MV) ${DESTDIR}/${PROG} ${DESTDIR}/${PROG}.${OLDEXT}
+-	$(MV) ${DESTDIR}/${XPROG} ${DESTDIR}/${XPROG}.${OLDEXT}
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)/${PROG}
 +
 +install-x11:	${XPROG}
 +	@${SHELL} $(SUPPORT_SRC)/mkdirs $(DESTDIR)
  	$(INSTALL_PROGRAM) $(XPROG) $(DESTDIR)/${XPROG}
--	$(INSTALL_PROGRAM) $(TEACHCE) $(DESTDIR)/$(TEACHCE)
+-	$(INSTALL_PROGRAM) -m 755 $(TEACHCE) $(DESTDIR)/$(TEACHCE)
++
  
  install-strip:
  	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
@@ -36,18 +38,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/08 19:59:08 schmonz Exp $
 -doc-install:	man-install installdirs
 +doc-install:
 +	@${SHELL} $(SUPPORT_SRC)/mkdirs $(DOCDIR)   
- 	${INSTALL_DATA} doc/TUTORIAL $(DOCDIR)/TUTORIAL
- 	${INSTALL_DATA} doc/ce.help  $(DOCDIR)/ce.help
- 	${INSTALL_DATA} doc/FUNCTIONS $(DOCDIR)/FUNCTIONS
+ 	${INSTALL_DATA} ${DOC_SRC}/TUTORIAL $(DOCDIR)/TUTORIAL
+ 	${INSTALL_DATA} ${DOC_SRC}/ce.help  $(DOCDIR)/ce.help
+ 	${INSTALL_DATA} ${DOC_SRC}/FUNCTIONS $(DOCDIR)/FUNCTIONS
 +	$(INSTALL_SCRIPT) $(TEACHCE) $(DESTDIR)/$(TEACHCE)
  
 -man-install: installdirs
 +man-install:
 +	@${SHELL} $(SUPPORT_SRC)/mkdirs $(MANDIR)
- 	${INSTALL_DATA} doc/ce.1 $(MANDIR)/ce.1
+ 	${INSTALL_DATA} ${DOC_SRC}/ce.1 $(MANDIR)/ce.1
 +
 +man-install-x11:
 +	@${SHELL} $(SUPPORT_SRC)/mkdirs $(MANDIR)
- 	${INSTALL_DATA} doc/xce.1 $(MANDIR)/xce.1
+ 	${INSTALL_DATA} ${DOC_SRC}/xce.1 $(MANDIR)/xce.1
  
- uninstall:
+ all-install:	install doc-install man-install
diff --git a/editors/ce/patches/patch-ab b/editors/ce/patches/patch-ab
index 079ef4f1fbc..6e6e63e0e01 100644
--- a/editors/ce/patches/patch-ab
+++ b/editors/ce/patches/patch-ab
@@ -1,12 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/08 19:59:08 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/08 07:46:15 schmonz Exp $
 
---- configure.orig	Wed Nov  5 16:13:27 1997
-+++ configure
-@@ -2508,6 +2508,7 @@
- s%@CPP@%$CPP%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@TERMCAP_LIB@%$TERMCAP_LIB%g
- s%@incdir@%$incdir%g
+--- teach-ce.in.orig	1999-03-30 12:56:24.000000000 -0500
++++ teach-ce.in
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ #
+ # @configure_input@
+ #
+@@ -34,7 +34,7 @@ esac
+ 
+ export PATH
+ 
+-LN="ln -s"
++LN="@LN@ -s"
+ 
+ TUTORIAL=@libdir@/ce/TUTORIAL
+ CE="@bindir@/ce"
diff --git a/editors/ce/patches/patch-ac b/editors/ce/patches/patch-ac
deleted file mode 100644
index c834452e5aa..00000000000
--- a/editors/ce/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/07/28 17:24:28 schmonz Exp $
-
---- teach-ce.orig	1991-03-16 17:22:04.000000000 -0500
-+++ teach-ce
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- #
- # teach-ce -- a script that sort of emulates Twenex Emacs' teach-emacs mode.
- #
-@@ -21,15 +21,15 @@
- 
- trap 'rm -f $HOME/TUTORIAL*' 0 1 2 3 6 15
- 
--PATH=/usr/local/bin:/usr/ucb:/bin:/usr/bin
--export PATH
-+# PATH=/usr/local/bin:/usr/ucb:/bin:/usr/bin
-+# export PATH
- 
--TUTORIAL=/usr/local/lib/ce/TUTORIAL
-+TUTORIAL=@PREFIX@/share/doc/ce/TUTORIAL
- 
--unset HISTFILE
-+# unset HISTFILE
- 
--LN="/bin/ln -s"
--CE="/usr/local/bin/ce"
-+LN="@LN@ -s"
-+CE="@LOCALBASE@/bin/ce"
- 
- $LN $TUTORIAL $HOME/TUTORIAL
- 
diff --git a/editors/ce/patches/patch-ad b/editors/ce/patches/patch-ad
deleted file mode 100644
index 7c9c841ea40..00000000000
--- a/editors/ce/patches/patch-ad
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/01/28 14:43:01 agc Exp $
-
---- ml.c.orig	1997-05-16 19:43:51.000000000 +0100
-+++ ml.c	2004-01-28 14:40:11.000000000 +0000
-@@ -354,22 +354,19 @@
-  * author, Paul Placeway (paul@tut.cis.ohio-state.edu)
-  */
- 
--#include <varargs.h>
-+#include <stdarg.h>
- 
- /*VARARGS0*/
--mlwrite(va_alist)
--va_dcl
-+mlwrite(char *fp, ...)
- {
--	register char *fp;
- 	va_list ap;
- 
- 	if (clexec)
- 		return;	
--	va_start(ap);
--	fp = va_arg(ap, char *);
-+	va_start(ap, fp);
- 	movecursor(term.t_nrow,0);
- 	(*term.t_color)(CTEXT);
--	(void) mlprintf(fp, &ap);
-+	(void) mlprintf(fp, ap);
- 	va_end(ap);
- 	(*term.t_eeol)();
- 	(*term.t_flush)();
-@@ -389,9 +386,7 @@
- static char prbuf[128];
- 
- /*VARARGS*/
--mlprintf (fp, ap)
--register char	*fp;
--va_list		*ap;
-+mlprintf (char *fp, ...)
- {
- 	register char *f, *bp;
- 	register long l;
-@@ -399,9 +394,11 @@
- 	register int i;
- 	register int fmt;
- 	register char pad = ' ';
-+	va_list	ap;
- 	int flush_left = 0, f_width = 0, prec = INF, hash = 0, do_long = 0;
- 	int sign = 0;
- 
-+	va_start(ap, fp);
- 	f = fp;
- 	for (; *f; f++) {
- 		CHKTTCOL();
-@@ -419,7 +416,7 @@
- 				f++;
- 			}
- 			if (*f == '*') {	/* field width */
--				f_width = va_arg(*ap, int);
-+				f_width = va_arg(ap, int);
- 				f++;
- 			} else if (ISDIGIT(*f)) {
- 				f_width = atoi (f);
-@@ -429,7 +426,7 @@
- 			if (*f == '.') {	/* precision */
- 				f++;
- 				if (*f == '*') {
--					prec = va_arg(*ap, int);
-+					prec = va_arg(ap, int);
- 					f++;
- 				} else if (ISDIGIT(*f)) {
- 					prec = atoi (f);
-@@ -454,9 +451,9 @@
- 			switch (fmt) {	/* do the format */
- 			    case 'd':
- 				if (do_long)
--					l = va_arg(*ap, long);
-+					l = va_arg(ap, long);
- 				else
--					l = (long) ( va_arg(*ap, int) );
-+					l = (long) ( va_arg(ap, int) );
- 				if (l < 0) {
- 					sign = 1;		    
- 					l = -l;
-@@ -485,9 +482,9 @@
- 			    case 'x':
- 			    case 'u':
- 				if (do_long)
--					u = va_arg(*ap, unsigned long);
-+					u = va_arg(ap, unsigned long);
- 				else
--					u = (unsigned long) (va_arg(*ap, unsigned));
-+					u = (unsigned long) (va_arg(ap, unsigned));
- 				if (fmt == 'u') { /* unsigned decimal */
- 					do {
- 						*bp++ = u % 10 + '0';
-@@ -525,11 +522,11 @@
- 					}
- 				break;
- 			    case 'c':
--				i = va_arg(*ap, int);
-+				i = va_arg(ap, int);
- 				mlputchar(i);
- 				break;
- 		  	    case 's':
--				bp = va_arg(*ap, char *);
-+				bp = va_arg(ap, char *);
- 				f_width = f_width - strlen(bp);
- 				if (!flush_left)
- 					while (f_width-- > 0) {
-@@ -553,6 +550,7 @@
- 			pad = ' ';
- 		}
- 	}
-+	va_end(ap);
- 	return 0;
- }
-