Fix build with gcc3 and libtool 1.5.

Fix installation directory of elisp file.
Sort PLIST and remove info files entries.

Bump PKGREVISION.

14 files changed, 120 insertions, 42 deletions

diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index b8e1b969220..790ff8232e9 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/08/09 11:16:18 seb Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/09 11:24:04 seb Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
 PKGNAME=	freewais-sf-2.2.12
+PKGREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/freeWAIS-sf/
 
diff --git a/net/freewais-sf/PLIST b/net/freewais-sf/PLIST
index 01396ec6074..15f76eedc83 100644
--- a/net/freewais-sf/PLIST
+++ b/net/freewais-sf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/04 12:08:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/09 11:24:04 seb Exp $
 bin/catalog
 bin/check-sources
 bin/dictionary
@@ -16,17 +16,16 @@ bin/waisretrieve
 bin/waissearch
 bin/waisserver
 bin/ws
+include/wais.h
 lib/libwais.a
 lib/libwais.la
 lib/libwais.so
 lib/libwais.so.2
 lib/libwais.so.2.2
-lib/emacs/lisp/wais.el
-include/wais.h
-man/man1/makedb.1
 man/man1/catalog.1
 man/man1/dictionary.1
 man/man1/inverted_file.1
+man/man1/makedb.1
 man/man1/mkfmt.1
 man/man1/waisindex.1
 man/man1/waisq.1
@@ -34,6 +33,6 @@ man/man1/waissearch.1
 man/man1/waisserver.1
 man/man1/xwais.1
 man/man1/xwaisq.1
-info/fwsf.info
-info/fwsf.info-1
-info/fwsf.info-2
+share/emacs/site-lisp/wais.el
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
diff --git a/net/freewais-sf/distinfo b/net/freewais-sf/distinfo
index 4b010942064..71a8df0acb4 100644
--- a/net/freewais-sf/distinfo
+++ b/net/freewais-sf/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/03/09 11:24:04 seb Exp $
 
 SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47
 Size (freeWAIS-sf-2.2.12.tar.gz) = 1002974 bytes
 SHA1 (patch-aa) = 46441022aa4ee9b97c2c5c54d2a54d53ceb0c2e7
 SHA1 (patch-ab) = e1e59cf668abe1ff7ec4c951ac50e38ceffaa0dd
 SHA1 (patch-ac) = 65736e07c191638cab4975f3cea398850e5158e9
-SHA1 (patch-ad) = d15b6de2046ded52686b104f640e3c9d74f37ad7
-SHA1 (patch-ae) = 7b9912a7190f80a386b210db57903b0f8b545ec8
-SHA1 (patch-af) = bebd2ba328187ea545d1c2b3d3b8f98bd0f9f063
-SHA1 (patch-ag) = 7b0ce26fbee1f7ddd10a3df012a63203ebf377a5
-SHA1 (patch-ah) = 7fec8725ea599a9f82c70f4693527300284d4371
-SHA1 (patch-ai) = 540f28e93530920968e07facac11bc07228a09f2
-SHA1 (patch-aj) = efd554a7bb63cd79888590b464c77becf13cf03e
-SHA1 (patch-ak) = 811d037f109532bcd5e6142ae91099dcb6732f37
+SHA1 (patch-ad) = 6302c42f5c0a0119e694fd0594dd5b24c77c2bc4
+SHA1 (patch-ae) = f7321c900f520be4e0327f9425071513269202b7
+SHA1 (patch-af) = 9ddf23275a94f04745fd88fe4d800ae1e67404e4
+SHA1 (patch-ag) = 193641650a89d5f812271a410b60045198d9fe2f
+SHA1 (patch-ah) = 7e43f96b5c4a48b520e0c2e298daff0f144de9e6
+SHA1 (patch-ai) = eb6665a84950404b4afebbcb0885ec2e6916ea43
+SHA1 (patch-aj) = 0df7a3712e0cde44887c6630bc362d5a3fa54381
+SHA1 (patch-ak) = 8b1172468823250d968e2159a55678c0336ae967
 SHA1 (patch-al) = 6b0e5274da7b04a81a90bd2fababaab5a245d1b3
 SHA1 (patch-am) = 2a96b165e934df5d19e84ba7e1dfe77c6d0d1a1c
 SHA1 (patch-an) = 07b2928ecdb09a56009a0be2b0ab852f94aac412
@@ -26,3 +26,6 @@ SHA1 (patch-au) = 6a4a52426e0751e097cf272ba6d2390e4b0022f6
 SHA1 (patch-av) = 4466d5c1c6394a03dc953e8f138b749113664b65
 SHA1 (patch-aw) = 00f267dd288dfcce627dbbb631cd388eae1a81af
 SHA1 (patch-ax) = 9934346f7d22c23d0682c316079bb4cdf01d77d7
+SHA1 (patch-ay) = b699615b0a152136fc6be02c899a2a0d4ea6ced1
+SHA1 (patch-az) = 8b608484a353c73e6e532bb4cb9f32a4270f1385
+SHA1 (patch-ba) = 55414bc530ef72426793014f09578bac1378cbb8
diff --git a/net/freewais-sf/patches/patch-ad b/net/freewais-sf/patches/patch-ad
index 330c7f9ce7a..2a14a9980ce 100644
--- a/net/freewais-sf/patches/patch-ad
+++ b/net/freewais-sf/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- lib/Makefile.SH.orig	Fri Apr 16 11:59:24 1999
 +++ lib/Makefile.SH	Sun May  9 23:54:32 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  
  AR = ar rc
 -CC = $cc
-+CC = \$(LIBTOOL) $cc
++CC = \$(LIBTOOL) --tag=CC --mode=compile $cc
  CTAGS = ctags
  MAKE = make
  MKDEP = $mkdep \$(DPFLAGS) --
@@ -41,7 +41,7 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  	$(RM) $@
 -	$(AR) $@ $(ALLOBJ)
 -	$(RANLIB) $@
-+	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${ALLOBJ:.o=.lo} -rpath ${PREFIX}/lib -version-info `echo $(REV) | tr . :`
++	${LIBTOOL} --tag=CC --mode=link cc -o ${.TARGET:.a=.la} ${ALLOBJ:.o=.lo} -rpath ${PREFIX}/lib -version-info `echo $(REV) | tr . :`
  
 -install:: libwais.a
 -	$(INSTALL) -c -m 644 libwais.a $(PRIVLIB)
diff --git a/net/freewais-sf/patches/patch-ae b/net/freewais-sf/patches/patch-ae
index d20ea23c2f1..a2f720c42be 100644
--- a/net/freewais-sf/patches/patch-ae
+++ b/net/freewais-sf/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-ae,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- lib/ctype/Makefile.SH.orig	Fri Apr 16 11:59:24 1999
 +++ lib/ctype/Makefile.SH	Sun May  9 01:35:19 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  # Parameters set by Configure -- edit config.sh if changes are needed
  
 -CC = $cc
-+CC = \$(LIBTOOL) $cc
++CC = \$(LIBTOOL) --tag=CC --mode=compile $cc
  CTAGS = ctags
  JCFLAGS = \$(CFLAGS) $optimize $ccflags $large
  JLDFLAGS = \$(LDFLAGS) $optimize $ldflags
diff --git a/net/freewais-sf/patches/patch-af b/net/freewais-sf/patches/patch-af
index d20a61a0405..e0854a85531 100644
--- a/net/freewais-sf/patches/patch-af
+++ b/net/freewais-sf/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-af,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- lib/ftw/Makefile.SH.orig	Fri Apr 16 11:59:25 1999
 +++ lib/ftw/Makefile.SH	Sun May  9 22:49:20 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  # Parameters set by Configure -- edit config.sh if changes are needed
  
 -CC = $cc
-+CC = \$(LIBTOOL) $cc
++CC = \$(LIBTOOL) --tag=CC --mode=compile $cc
  CTAGS = ctags
  JCFLAGS = \$(CFLAGS) $optimize $ccflags $large
  JLDFLAGS = \$(LDFLAGS) $optimize $ldflags
diff --git a/net/freewais-sf/patches/patch-ag b/net/freewais-sf/patches/patch-ag
index ba6241c43cd..f3d9d788596 100644
--- a/net/freewais-sf/patches/patch-ag
+++ b/net/freewais-sf/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-ag,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- lib/ir/Makefile.SH.orig	Fri Apr 16 11:59:27 1999
 +++ lib/ir/Makefile.SH	Sun May  9 01:36:08 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  # Parameters set by Configure -- edit config.sh if changes are needed
  
 -CC = $cc
-+CC = \$(LIBTOOL) $cc
++CC = \$(LIBTOOL) --tag=CC --mode=compile $cc
  CP = $cp
  CTAGS = ctags
  JLFLAGS = \$(LFLAGS)
diff --git a/net/freewais-sf/patches/patch-ah b/net/freewais-sf/patches/patch-ah
index bc0ea317fa3..a92904d8546 100644
--- a/net/freewais-sf/patches/patch-ah
+++ b/net/freewais-sf/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-ah,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- lib/regexp/Makefile.SH.orig	Fri Apr 16 11:59:43 1999
 +++ lib/regexp/Makefile.SH	Tue May 11 00:26:40 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ah,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  # Parameters set by Configure -- edit config.sh if changes are needed
  
 -CC = $cc
-+CC = \$(LIBTOOL) $cc
++CC = \$(LIBTOOL) --tag=CC --mode=compile $cc
  CTAGS = ctags
  JCFLAGS = \$(CFLAGS) $optimize $ccflags $large
  JLDFLAGS = \$(LDFLAGS) $optimize $ldflags
diff --git a/net/freewais-sf/patches/patch-ai b/net/freewais-sf/patches/patch-ai
index 25b179e67f1..f1ecae1dde9 100644
--- a/net/freewais-sf/patches/patch-ai
+++ b/net/freewais-sf/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-ai,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- indexer/Makefile.SH.orig	Fri Apr 16 11:59:23 1999
 +++ indexer/Makefile.SH	Sun May  9 23:14:01 1999
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  	$(RM) $@
  	if test -f $@; then $(MV) $@ $@~; else exit 0; fi
 -	$(CC) -o $@ waisindex.o $(JLDFLAGS) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ waisindex.o $(JLDFLAGS) $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ waisindex.o $(JLDFLAGS) $(LIBS)
  
  install:: waisindex
 -	$(INSTALL) -c -s -m 555  waisindex $(BIN_EXP)
diff --git a/net/freewais-sf/patches/patch-aj b/net/freewais-sf/patches/patch-aj
index 9acfd4043ae..8f51a4ed5ed 100644
--- a/net/freewais-sf/patches/patch-aj
+++ b/net/freewais-sf/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-aj,v 1.2 2004/03/09 11:24:04 seb Exp $
 
 --- server/Makefile.SH.orig	Fri Apr 16 11:59:45 1999
 +++ server/Makefile.SH	Sun May  9 23:16:33 1999
@@ -16,7 +16,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  	$(RM) $@
  	if test -f $@; then $(MV) $@ $@~; else exit 0; fi
 -	$(CC) -o $@ waisserver.o $(JLDFLAGS) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ waisserver.o $(JLDFLAGS) $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ waisserver.o $(JLDFLAGS) $(LIBS)
  
  install:: waisserver
 -	$(INSTALL) -c -s -m 555  waisserver $(BIN_EXP)
diff --git a/net/freewais-sf/patches/patch-ak b/net/freewais-sf/patches/patch-ak
index 871b72500e7..b81d5e6b979 100644
--- a/net/freewais-sf/patches/patch-ak
+++ b/net/freewais-sf/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
+$NetBSD: patch-ak,v 1.2 2004/03/09 11:24:04 seb Exp $
 
---- ui/Makefile.SH.orig	Fri Apr 16 11:59:47 1999
-+++ ui/Makefile.SH	Sun May  9 23:17:38 1999
-@@ -57,7 +57,7 @@
+--- ui/Makefile.SH.orig	1999-04-16 09:59:47.000000000 +0000
++++ ui/Makefile.SH
+@@ -57,7 +57,7 @@ SED = $sed
  
  CFLAGS = $ccflags $optimize -I\$(TOP)/lib/ir $mccflags $embed_cflags
  DPFLAGS = -I\$(TOP)/lib/ir $mccflags $embed_cflags
@@ -11,12 +11,12 @@ $NetBSD: patch-ak,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  BIN_EXP = $installbin
  PRIVLIB = $installprivlib
  USRINC = $usrinc
-@@ -112,10 +112,10 @@
+@@ -112,10 +112,10 @@ local_realclean::
  waissearch: waissearch.o $(OBJ1)
  	$(RM) $@
  	if test -f $@; then $(MV) $@ $@~; else exit 0; fi
 -	$(CC) -o $@ waissearch.o $(OBJ1) $(JLDFLAGS) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ waissearch.o $(OBJ1) $(JLDFLAGS) $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ waissearch.o $(OBJ1) $(JLDFLAGS) $(LIBS)
  
  install:: waissearch
 -	$(INSTALL) -c -s -m 555  waissearch $(BIN_EXP)
@@ -24,12 +24,12 @@ $NetBSD: patch-ak,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  
  deinstall::
  	$(RM) $(BIN_EXP)/waissearch
-@@ -128,10 +128,10 @@
+@@ -128,10 +128,10 @@ local_realclean::
  waisq: waisq.o $(OBJS)
  	$(RM) $@
  	if test -f $@; then $(MV) $@ $@~; else exit 0; fi
 -	$(CC) -o $@ waisq.o $(OBJS) $(JLDFLAGS) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ waisq.o $(OBJS) $(JLDFLAGS) $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ waisq.o $(OBJS) $(JLDFLAGS) $(LIBS)
  
  install:: waisq
 -	$(INSTALL) -c -s -m 555  waisq $(BIN_EXP)
@@ -37,12 +37,12 @@ $NetBSD: patch-ak,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  
  deinstall::
  	$(RM) $(BIN_EXP)/waisq
-@@ -144,10 +144,10 @@
+@@ -144,10 +144,10 @@ local_realclean::
  swais: swais.o $(OBJS)
  	$(RM) $@
  	if test -f $@; then $(MV) $@ $@~; else exit 0; fi
 -	$(CC) -o $@ swais.o $(OBJS) $(JLDFLAGS) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ swais.o $(OBJS) $(JLDFLAGS) $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ swais.o $(OBJS) $(JLDFLAGS) $(LIBS)
  
  install:: swais
 -	$(INSTALL) -c -s -m 555  swais $(BIN_EXP)
@@ -50,3 +50,23 @@ $NetBSD: patch-ak,v 1.1.1.1 1999/05/11 13:56:53 bad Exp $
  
  deinstall::
  	$(RM) $(BIN_EXP)/swais
+@@ -180,16 +180,13 @@ wais.el: wais.el.raw
+ 	$(SED) -e 's:INSTALLROOT:"$(BIN_EXP)/":g' < wais.el.raw > wais.el;
+ 
+ install::
+-	@for dir in  $(PRIVLIB)/emacs $(PRIVLIB)/emacs/lisp; do \
+-	case '${MFLAGS}' in *[i]*) set +e;; esac; \
+-	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
+-	done
++	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/emacs/site-lisp
+ 
+ install:: wais.el
+-	$(INSTALL) -c -m 444 wais.el  $(PRIVLIB)/emacs/lisp
++	$(BSD_INSTALL_DATA) wais.el  $(PREFIX)/share/emacs/site-lisp
+ 
+ deinstall::
+-	$(RM)  $(PRIVLIB)/emacs/lisp/wais.el
++	$(RM)  $(PREFIX)/share/emacs/site-lisp/wais.el
+ 
+ local_realclean::
+ 	$(RM) wais.el
diff --git a/net/freewais-sf/patches/patch-ay b/net/freewais-sf/patches/patch-ay
new file mode 100644
index 00000000000..ea0469da26a
--- /dev/null
+++ b/net/freewais-sf/patches/patch-ay
@@ -0,0 +1,15 @@
+$NetBSD: patch-ay,v 1.1 2004/03/09 11:24:04 seb Exp $
+
+--- lib/ir/syslog.c.orig	1999-04-16 09:59:37.000000000 +0000
++++ lib/ir/syslog.c
+@@ -104,8 +104,10 @@ syslog(pri, fmt, va_alist)
+ 
+ #ifdef HAS_SYS_ERRLIST
+ extern int      errno;
++#if !(defined(BSD) && BSD >= 199306)
+ extern int      sys_nerr;
+ #endif
++#endif
+ 
+ 
+ /*
diff --git a/net/freewais-sf/patches/patch-az b/net/freewais-sf/patches/patch-az
new file mode 100644
index 00000000000..211580d5e91
--- /dev/null
+++ b/net/freewais-sf/patches/patch-az
@@ -0,0 +1,15 @@
+$NetBSD: patch-az,v 1.1 2004/03/09 11:24:04 seb Exp $
+
+--- lib/ir/sockets.c.orig	1999-04-16 09:59:35.000000000 +0000
++++ lib/ir/sockets.c
+@@ -71,8 +71,10 @@ close_connection_to_server (file)
+ 
+ #ifdef HAS_SYS_ERRLIST
+ extern int      errno;
++#if !(defined(BSD) && BSD >= 199306)
+ extern int      sys_nerr;
+ #endif
++#endif
+ 
+ char            host_name[255], host_address[255];
+ 
diff --git a/net/freewais-sf/patches/patch-ba b/net/freewais-sf/patches/patch-ba
new file mode 100644
index 00000000000..77ed44602c0
--- /dev/null
+++ b/net/freewais-sf/patches/patch-ba
@@ -0,0 +1,25 @@
+$NetBSD: patch-ba,v 1.1 2004/03/09 11:24:04 seb Exp $
+
+--- server/waisserver.c.orig	1999-04-16 09:59:45.000000000 +0000
++++ server/waisserver.c
+@@ -44,6 +44,9 @@ static char *PRCSid = "$Id: waisserver.c
+ #ifdef I_SYS_SELECT
+ #include <sys/select.h>
+ #endif
++#ifdef I_SYS_PARAM
++#include <sys/param.h>
++#endif
+ #include "cdialect.h"
+ #include "panic.h"
+ #include "ustubs.h"
+@@ -314,8 +317,10 @@ srcfiles(e)
+ 
+ #ifdef HAS_SYS_ERRLIST
+ extern int      errno;
++#if !(defined(BSD) && BSD >= 199306)
+ extern int      sys_nerr;
+ #endif
++#endif
+ 
+ Pid_t pgrp;
+