Restructure patch-aa to get it integrated in the main tree.

Remove patch-a{b,c,d} since self tests work now.
Correct HOMEPAGE.

6 files changed, 69 insertions, 117 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index ac8da7268c4..b99b03127b6 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:33 rh Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/16 23:53:43 wiz Exp $
 
 DISTNAME=		clisp-2000-03-06
 PKGNAME=		clisp-20000306
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp2.cons.org/pub/lisp/clisp/source/ \
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		mjl@netbsd.org
-HOMEPAGE=		http://clisp.cons.org/~haible/clisp.html
+HOMEPAGE=		http://clisp.cons.org/
 
 NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 problems
 
@@ -16,13 +16,12 @@ MIRROR_DISTFILE=	no
 
 GNU_CONFIGURE=		YES
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-# USE_PKGLIBTOOL=		YES
 
 do-configure:
 	cd ${WRKSRC}; \
 	(cd ..;${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}); \
 	./makemake --prefix=${LOCALBASE} --with-readline --with-gettext \
-	  --with-dynamic-ffi >Makefile
+	  --with-dynamic-ffi --fsstnd=netbsd >Makefile
 
 post-install:
 	${CHOWN} -R root:wheel ${PREFIX}/lib/clisp
diff --git a/lang/clisp/files/patch-sum b/lang/clisp/files/patch-sum
index 5563fe84d95..62dd2ea87d7 100644
--- a/lang/clisp/files/patch-sum
+++ b/lang/clisp/files/patch-sum
@@ -1,8 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/05/27 02:47:14 wiz Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/16 23:53:43 wiz Exp $
 
-MD5 (patch-aa) = fdf8cc1f04b77e64428eaab6bf46d147
-MD5 (patch-ab) = 37d633290e501d6b2d095aa96ea0c84b
-MD5 (patch-ac) = 26e0173435a8879cd6ff45160d4b83ce
-MD5 (patch-ad) = dc78c2c68378f7147dbfe3c7c8377471
+MD5 (patch-aa) = 04d1ab7d3eea6706c31b3dcf0bf7c090
 MD5 (patch-ae) = db065949b2bd8dd8349b51a56f5d36a3
 MD5 (patch-af) = b01aac5b2fa4827c1d0783b2855ef19d
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index bbd12814f07..ae9911c6cad 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.7 2000/05/27 02:47:14 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2000/06/16 23:53:43 wiz Exp $
 
---- makemake.in.orig	Thu May 25 16:35:13 2000
-+++ makemake.in	Thu May 25 16:51:16 2000
+--- makemake.in.orig	Mon Mar  6 12:37:21 2000
++++ makemake.in	Mon Jun  5 23:32:06 2000
+@@ -159,7 +159,7 @@
+ srcdir=''
+ prefix=''
+ exec_prefix=''
+-fsstnd=gnu_ext # supported styles: gnu, gnu_ext, suse, redhat, debian
++fsstnd=gnu_ext # supported styles: gnu_ext, suse, redhat, debian, netbsd
+ MODULES=''
+ CP='cp -p'
+ LN_S='ln -s'
 @@ -317,7 +317,7 @@
       LIBDL='@LIBDL@'                     # either '-ldl' or ''
       LIBICONV='@LIBICONV@'               # either '-liconv' or ''
@@ -16,94 +25,91 @@ $NetBSD: patch-aa,v 1.7 2000/05/27 02:47:14 wiz Exp $
  fi
  
 +if [ "$TSYSOS" = "netbsd" ] ; then # NetBSD
-+       XCFLAGS=$XCFLAGS' -DNO_GENERATIONAL_GC -fpcc-struct-return -Dunix'
++       XCFLAGS=$XCFLAGS' -Dunix'
 +fi
  if [ $TSYS = sun4 -a $CROSS = false ] ; then
    ARCH_K=`(arch -k) 2>/dev/null || uname -m 2>/dev/null` # kernel architecture, see arch(1)
    if [ "$ARCH_K" = sun4 -o "$ARCH_K" = sun4c -o "$ARCH_K" = sun4e ] ; then
-@@ -1623,7 +1626,7 @@
- echol "dvidir = \$(exec_prefix)${NEXT_}share${NEXT_}dvi"
- case "$fsstnd" in
-   gnu_ext)
--    echol "docdir = \$(exec_prefix)${NEXT_}doc"
-+    echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
+@@ -1626,6 +1629,10 @@
+     echol "docdir = \$(exec_prefix)${NEXT_}doc"
      echol "lispdocdir = \$(docdir)${NEXT_}clisp"
      ;;
++  netbsd)
++    echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
++    echol "lispdocdir = \$(docdir)${NEXT_}clisp"
++    ;;
    suse)
-@@ -2533,7 +2536,7 @@
-   if [ $HOS = unix ] ; then
-     echotab "if test -d locale; then rm -rf locale; fi"
-     echotab "mkdir locale"
--    echotab "(cd gettext/po && \$(MAKE) && \$(MAKE) install datadir=../.. localedir='\$\$(datadir)/locale' INSTALL_DATA=ln) || (rm -rf locale ; exit 1)"
-+    echotab "(cd gettext/po && \$(MAKE) && \$(MAKE) install datadir=../.. localedir='\$\$(datadir)/locale' INSTALL_DATA=\"ln -f\") || (rm -rf locale ; exit 1)"
-   else
-     echotab "mkdir locale"
-     eval `grep ALL_LINGUAS= src/gettext/configure.in`
-@@ -3130,13 +3133,11 @@
-     case "$fsstnd" in
-       gnu_ext)
-         echotab "if [ ! -d \$(install_root)\$(exec_prefix)/share ] ; then mkdir \$(install_root)\$(exec_prefix)/share ; fi"
--        echotab "if [ ! -d \$(install_root)\$(htmldir) ] ; then mkdir \$(install_root)\$(htmldir) ; fi"
--        echotab "if [ ! -d \$(install_root)\$(dvidir) ] ; then mkdir \$(install_root)\$(dvidir) ; fi"
-+        echotab "if [ ! -d \$(prefix)/share/doc/clisp ] ; then mkdir \$(prefix)/share/doc/clisp ; fi"
+     echol "docdir = \$(exec_prefix)${NEXT_}doc"
+     echol "lispdocdir = \$(docdir)${NEXT_}packages${NEXT_}clisp"
+@@ -3133,10 +3140,17 @@
+         echotab "if [ ! -d \$(install_root)\$(htmldir) ] ; then mkdir \$(install_root)\$(htmldir) ; fi"
+         echotab "if [ ! -d \$(install_root)\$(dvidir) ] ; then mkdir \$(install_root)\$(dvidir) ; fi"
          ;;
++      netbsd)
++        echotab "if [ ! -d \$(install_root)\$(exec_prefix)/share ] ; then mkdir \$(install_root)\$(exec_prefix)/share ; fi"
++        echotab "if [ ! -d \$(prefix)/share/doc/clisp ] ; then mkdir \$(prefix)/share/doc/clisp ; fi"
++        ;;
      esac
      echotab "if [ ! -d \$(install_root)\$(docdir) ] ; then mkdir \$(install_root)\$(docdir) ; fi"
      echotab "if [ ! -d \$(install_root)\$(lispdocdir) ] ; then mkdir \$(install_root)\$(lispdocdir) ; fi"
 -    echotab "if [ ! -d \$(install_root)\$(lispdocdir)/doc ] ; then mkdir \$(install_root)\$(lispdocdir)/doc ; fi"
++    if [ "$fsstnd" != netbsd ]
++    then
++	echotab "if [ ! -d \$(install_root)\$(lispdocdir)/doc ] ; then mkdir \$(install_root)\$(lispdocdir)/doc ; fi"
++    fi
      echol
      echol "install-bin : lisp${LEXE} lispinit.mem clisp.c force"
      echotab "if [ ! -d \$(install_root)\$(prefix) ] ; then mkdir \$(install_root)\$(prefix) ; fi"
-@@ -3178,17 +3179,10 @@
-     case "$fsstnd" in
-       gnu_ext)
-         echotab "if [ ! -d \$(install_root)\$(exec_prefix)/share ] ; then mkdir \$(install_root)\$(exec_prefix)/share ; fi"
--        echotab "if [ ! -d \$(install_root)\$(htmldir) ] ; then mkdir \$(install_root)\$(htmldir) ; fi"
--        echotab "\$(INSTALL_DATA) clisp.html \$(install_root)\$(htmldir)/clisp.html"
+@@ -3191,6 +3205,14 @@
+           echotab "\$(INSTALL_DATA) clreadline.dvi \$(install_root)\$(dvidir)/clreadline.dvi"
+         fi
+         ;;
++      netbsd)
++        echotab "if [ ! -d \$(install_root)\$(exec_prefix)/share ] ; then mkdir \$(install_root)\$(exec_prefix)/share ; fi"
 +        echotab "if [ ! -d \$(install_root)\$(prefix)/share/doc/clisp ] ; then mkdir \$(install_root)\$(prefix)/share/doc/clisp ; fi"
 +        echotab "\$(INSTALL_DATA) clisp.html \$(install_root)\$(prefix)/share/doc/clisp/clisp.html"
-         if [ $TERMINAL = readline ] ; then
--          echotab "\$(INSTALL_DATA) clreadline.html \$(install_root)\$(htmldir)/clreadline.html"
--        fi
--        echotab "if [ ! -d \$(install_root)\$(dvidir) ] ; then mkdir \$(install_root)\$(dvidir) ; fi"
--        if test -n "$GROFF"; then
--          echotab "\$(INSTALL_DATA) clisp.dvi \$(install_root)\$(dvidir)/clisp.dvi"
--        fi
--        if [ $TERMINAL = readline ] ; then
--          echotab "\$(INSTALL_DATA) clreadline.dvi \$(install_root)\$(dvidir)/clreadline.dvi"
++        if [ $TERMINAL = readline ] ; then
 +          echotab "\$(INSTALL_DATA) clreadline.html \$(install_root)\$(prefix)/share/doc/clisp/clreadline.html"
-         fi
-         ;;
++        fi
++        ;;
      esac
-@@ -3198,9 +3192,8 @@
+     echol
+     echol "install-doc : \$(READMES) \$(MANUALS)${manual_dvi} force"
+@@ -3198,9 +3220,14 @@
      echotab "if [ ! -d \$(install_root)\$(exec_prefix) ] ; then mkdir \$(install_root)\$(exec_prefix) ; fi"
      echotab "if [ ! -d \$(install_root)\$(docdir) ] ; then mkdir \$(install_root)\$(docdir) ; fi"
      echotab "if [ ! -d \$(install_root)\$(lispdocdir) ] ; then mkdir \$(install_root)\$(lispdocdir) ; fi"
 -    echotab "if [ ! -d \$(install_root)\$(lispdocdir)/doc ] ; then mkdir \$(install_root)\$(lispdocdir)/doc ; fi"
      echotab "\$(INSTALL_DATA) \$(READMES) \$(install_root)\$(lispdocdir)/"
 -    echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(install_root)\$(lispdocdir)/doc/"
-+    echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(install_root)\$(lispdocdir)/"
++    if [ "$fsstnd" = netbsd ]
++    then
++	echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(install_root)\$(lispdocdir)/"
++    else
++	echotab "if [ ! -d \$(install_root)\$(lispdocdir)/doc ] ; then mkdir \$(install_root)\$(lispdocdir)/doc ; fi"
++	echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(install_root)\$(lispdocdir)/doc/"
++    fi
      echol
      echol
      echol "installcheck : ${TESTSDIR} force"
-@@ -3227,18 +3220,13 @@
-     fi
-     case "$fsstnd" in
-       gnu_ext)
--        echotab "\$(RM) \$(install_root)\$(htmldir)/clisp.html"
--        if [ $TERMINAL = readline ] ; then
--          echotab "\$(RM) \$(install_root)\$(htmldir)/clreadline.html"
--        fi
--        echotab "\$(RM) \$(install_root)\$(dvidir)/clisp.dvi"
-         if [ $TERMINAL = readline ] ; then
--          echotab "\$(RM) \$(install_root)\$(dvidir)/clreadline.dvi"
-+          echotab "\$(RM) \$(install_root)\$(prefix)/share/doc/clisp/clreadline.html"
+@@ -3236,9 +3263,19 @@
+           echotab "\$(RM) \$(install_root)\$(dvidir)/clreadline.dvi"
          fi
          ;;
++      netbsd)
++        if [ $TERMINAL = readline ] ; then
++          echotab "\$(RM) \$(install_root)\$(prefix)/share/doc/clisp/clreadline.html"
++        fi
++        ;;
      esac
      echotab "for f in \$(READMES); do \$(RM) \$(install_root)\$(lispdocdir)/\$\$f; done"
 -    echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(install_root)\$(lispdocdir)/doc/\$\$f; done"
-+    echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(install_root)\$(lispdocdir)/\$\$f; done"
++    if [ "$fsstnd" = netbsd ]
++    then
++	echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(install_root)\$(lispdocdir)/\$\$f; done"
++    else
++	echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(install_root)\$(lispdocdir)/doc/\$\$f; done"
++    fi
      echol
      echol
    fi
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
deleted file mode 100644
index dc1f5d84689..00000000000
--- a/lang/clisp/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/12/18 04:53:18 mjl Exp $
-
---- ../sigsegv/Makefile.in.orig	Sat Dec 18 03:24:39 1999
-+++ ../sigsegv/Makefile.in	Sat Dec 18 03:25:58 1999
-@@ -106,9 +106,10 @@
- 	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) $(srcdir)/test3.c @GCC_X_NONE@ libsigsegv.la -o test3
- 
- check : all test1 test2 test3
--	./test1
--	./test2
--	./test3
-+#	./test1
-+#	./test2
-+#	./test3
-+# Those crash on NetBSD, no way here to get fault address from trap frame
- 
- mostlyclean : clean
- 
diff --git a/lang/clisp/patches/patch-ac b/lang/clisp/patches/patch-ac
deleted file mode 100644
index ee9b908c925..00000000000
--- a/lang/clisp/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/12/18 04:53:18 mjl Exp $
-
---- ../ffcall/avcall/Makefile.in.orig	Sat Dec 18 03:39:13 1999
-+++ ../ffcall/avcall/Makefile.in	Sat Dec 18 03:39:31 1999
-@@ -189,10 +189,7 @@
- tests : tests.o libavcall.la
- 	$(LIBTOOL_LINK) $(CC) $(CFLAGS) @GCC_X_NONE@ tests.o libavcall.la -o tests
- 
--check : all tests
--	./tests > tests.out
--	uniq -u < tests.out > tests.output.$(HOST)
--	test '!' -s tests.output.$(HOST)
-+check : # all tests
- 
- mostlyclean : clean
- 
diff --git a/lang/clisp/patches/patch-ad b/lang/clisp/patches/patch-ad
deleted file mode 100644
index b716e3e1fb8..00000000000
--- a/lang/clisp/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/12/18 04:53:18 mjl Exp $
-
---- ../ffcall/callback/Makefile.in.orig	Sat Dec 18 03:30:02 1999
-+++ ../ffcall/callback/Makefile.in	Sat Dec 18 03:30:39 1999
-@@ -134,10 +134,7 @@
- check-subdirs : force
- 	cd @subdir@; $(MAKE) -r check
- 
--check : all check-subdirs tests
--	./tests > tests.out
--	uniq -u < tests.out > tests.output.$(HOST)
--	test '!' -s tests.output.$(HOST)
-+check : # Fail with egcs
- 
- mostlyclean : force
- 	cd @subdir@; $(MAKE) -r mostlyclean