From 1e9cab383be35b015fd59e17d0dd333bff699253 Mon Sep 17 00:00:00 2001 From: mjl Date: Sat, 18 Dec 1999 04:53:17 +0000 Subject: Make this package patch and compile again. --- lang/clisp/Makefile | 14 +++---- lang/clisp/files/md5 | 4 +- lang/clisp/files/patch-sum | 12 +++--- lang/clisp/patches/patch-aa | 94 +++++++++++++++++++++++++++++++++------------ lang/clisp/patches/patch-ab | 41 ++++++++------------ lang/clisp/patches/patch-ac | 14 +++---- lang/clisp/patches/patch-ad | 14 +++---- lang/clisp/patches/patch-ae | 32 ++++++--------- lang/clisp/pkg/PLIST | 53 +++++++++++++++++++++++-- 9 files changed, 176 insertions(+), 102 deletions(-) (limited to 'lang') diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index ba1623af4c8..5021d6ada0e 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,23 +1,21 @@ -# $NetBSD: Makefile,v 1.10 1999/10/27 17:14:09 agc Exp $ +# $NetBSD: Makefile,v 1.11 1999/12/18 04:53:17 mjl Exp $ -DISTNAME= clispsrc +DISTNAME= clisp-1999-07-22 PKGNAME= clisp-19990722 CATEGORIES= lang MASTER_SITES= ftp://ftp2.cons.org/pub/lisp/clisp/source/ \ ftp://ftp.tu-darmstadt.de/pub/programming/languages/lisp/clisp/source/ -MAINTAINER= mjl@emsi.priv.at +MAINTAINER= mjl@netbsd.org HOMEPAGE= http://clisp.cons.org/~haible/clisp.html -BROKEN= Bad patch - NOT_FOR_PLATFORM= *-*-alpha # severe LP64 problems MIRROR_DISTFILE= no -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -WRKSRC= ${WRKDIR}/clisp-1999-07-22/src +GNU_CONFIGURE= YES +WRKSRC= ${WRKDIR}/${DISTNAME}/src +# USE_LIBTOOL= yes do-configure: cd ${WRKSRC}; \ diff --git a/lang/clisp/files/md5 b/lang/clisp/files/md5 index 5d992433aef..b08ff204368 100644 --- a/lang/clisp/files/md5 +++ b/lang/clisp/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1999/07/21 23:25:07 mjl Exp $ +$NetBSD: md5,v 1.6 1999/12/18 04:53:18 mjl Exp $ -MD5 (clispsrc.tar.gz) = 2faa2d691742f2ab4d259c51fe1afaf5 +MD5 (clisp-1999-07-22.tar.gz) = 25bdf66df55b81a54c16ea5102610483 diff --git a/lang/clisp/files/patch-sum b/lang/clisp/files/patch-sum index 4da4fe22623..5d666f7fa14 100644 --- a/lang/clisp/files/patch-sum +++ b/lang/clisp/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.2 1999/07/21 23:25:07 mjl Exp $ +$NetBSD: patch-sum,v 1.3 1999/12/18 04:53:18 mjl Exp $ -MD5 (patch-aa) = fab0d13b56e2151afc70560ebd772404 -MD5 (patch-ab) = 68ed5a3e2c24ed9cdc722e0a679e835e -MD5 (patch-ac) = 5fa885c40d5d3adc399767d2662e9928 -MD5 (patch-ad) = 8fc4ada35519036076aa6f05f92fa12f -MD5 (patch-ae) = 3c850fbdb7a0d1a03425d45cadf23e38 +MD5 (patch-aa) = 4fa70d37c227192a50f68152de6e0a3b +MD5 (patch-ab) = 37d633290e501d6b2d095aa96ea0c84b +MD5 (patch-ac) = 26e0173435a8879cd6ff45160d4b83ce +MD5 (patch-ad) = dc78c2c68378f7147dbfe3c7c8377471 +MD5 (patch-ae) = db065949b2bd8dd8349b51a56f5d36a3 diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa index b80c60c7fb8..3edf0eb1eec 100644 --- a/lang/clisp/patches/patch-aa +++ b/lang/clisp/patches/patch-aa @@ -1,27 +1,37 @@ -$NetBSD: patch-aa,v 1.5 1999/07/21 23:25:08 mjl Exp $ +$NetBSD: patch-aa,v 1.6 1999/12/18 04:53:18 mjl Exp $ ---- makemake.in.orig Thu Jan 7 16:23:48 1999 -+++ makemake.in Wed Jul 21 20:07:38 1999 -@@ -280,7 +280,7 @@ +--- makemake.in.orig Tue Jul 20 21:03:11 1999 ++++ makemake.in Sat Dec 18 04:45:33 1999 +@@ -316,7 +316,7 @@ LIBTERMCAP='@LIBTERMCAP@' # either '-ltermcap' or '-lncurses' LIBDL='@LIBDL@' # either '-ldl' or '' X_INCLUDES='@X_INCLUDES@' # either '-I/usr/somewhere/include' or '' - X_LIBS='@X_LIBS@' # either '-L/usr/somewhere/lib -lX11' or '' -+ X_LIBS='-Wl,-rpath ${X11BASE}/lib @X_LIBS@' # either '-L/usr/somewhere/lib -lX11' or '' ++ X_LIBS='-Wl,-rpath ${X11BASE}/lib @X_LIBS@' # either '-L/usr/somewhere/lib -lX11' or '' host='@host@' # something like 'sparc-sun-sunos4' host_cpu='@host_cpu@' # something like 'sparc' host_vendor='@host_vendor@' # something like 'sun' -@@ -1056,6 +1056,9 @@ - *) ;; +@@ -1116,6 +1116,10 @@ esac fi + +if [ "$TSYSOS" = "netbsd" ] ; then # NetBSD -+ XCFLAGS=$XCFLAGS' -DNO_GENERATIONAL_GC -fpcc-struct-return -Dunix' ++ XCFLAGS=$XCFLAGS' -DNO_GENERATIONAL_GC -fpcc-struct-return -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) -@@ -2380,7 +2383,7 @@ + if [ "$ARCH_K" = sun4 -o "$ARCH_K" = sun4c -o "$ARCH_K" = sun4e ] ; then +@@ -1595,7 +1599,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" + echol "lispdocdir = \$(docdir)${NEXT_}clisp" + ;; + suse) +@@ -2503,7 +2507,7 @@ if [ $HOS = unix ] ; then echotab "if test -d locale; then rm -rf locale; fi" echotab "mkdir locale" @@ -30,38 +40,72 @@ $NetBSD: patch-aa,v 1.5 1999/07/21 23:25:08 mjl Exp $ else echotab "mkdir locale" eval `grep ALL_LINGUAS= src/gettext/configure.in` -@@ -2919,7 +2922,7 @@ - fi +@@ -3084,13 +3088,11 @@ case "$fsstnd" in gnu_ext) -- echotab "if [ ! -d \$(mandir)/html ] ; then mkdir \$(mandir)/html ; fi" + echotab "if [ ! -d \$(exec_prefix)/share ] ; then mkdir \$(exec_prefix)/share ; fi" +- echotab "if [ ! -d \$(htmldir) ] ; then mkdir \$(htmldir) ; fi" +- echotab "if [ ! -d \$(dvidir) ] ; then mkdir \$(dvidir) ; fi" + echotab "if [ ! -d \$(prefix)/share/doc/clisp ] ; then mkdir \$(prefix)/share/doc/clisp ; fi" ;; - suse | redhat | debian) - echotab "if [ ! -d \$(docdir) ] ; then mkdir \$(docdir) ; fi" -@@ -2977,10 +2980,10 @@ - fi + esac + echotab "if [ ! -d \$(docdir) ] ; then mkdir \$(docdir) ; fi" + echotab "if [ ! -d \$(lispdocdir) ] ; then mkdir \$(lispdocdir) ; fi" +- echotab "if [ ! -d \$(lispdocdir)/doc ] ; then mkdir \$(lispdocdir)/doc ; fi" + echol + echol "install-bin : lisp${LEXE} lispinit.mem clisp.c force" + echotab "if [ ! -d \$(prefix) ] ; then mkdir \$(prefix) ; fi" +@@ -3132,17 +3134,10 @@ case "$fsstnd" in gnu_ext) -- echotab "if [ ! -d \$(mandir)/html ] ; then mkdir \$(mandir)/html ; fi" -- echotab "\$(INSTALL_DATA) clisp.html \$(mandir)/html/clisp.html" + echotab "if [ ! -d \$(exec_prefix)/share ] ; then mkdir \$(exec_prefix)/share ; fi" +- echotab "if [ ! -d \$(htmldir) ] ; then mkdir \$(htmldir) ; fi" +- echotab "\$(INSTALL_DATA) clisp.html \$(htmldir)/clisp.html" +- if [ $TERMINAL = readline ] ; then +- echotab "\$(INSTALL_DATA) clreadline.html \$(htmldir)/clreadline.html" +- fi +- echotab "if [ ! -d \$(dvidir) ] ; then mkdir \$(dvidir) ; fi" +- if test -n "$GROFF"; then +- echotab "\$(INSTALL_DATA) clisp.dvi \$(dvidir)/clisp.dvi" +- fi + echotab "if [ ! -d \$(prefix)/share/doc/clisp ] ; then mkdir \$(prefix)/share/doc/clisp ; fi" + echotab "\$(INSTALL_DATA) clisp.html \$(prefix)/share/doc/clisp/clisp.html" if [ $TERMINAL = readline ] ; then -- echotab "\$(INSTALL_DATA) clreadline.html \$(mandir)/html/clreadline.html" +- echotab "\$(INSTALL_DATA) clreadline.dvi \$(dvidir)/clreadline.dvi" + echotab "\$(INSTALL_DATA) clreadline.html \$(prefix)/share/doc/clisp/clreadline.html" fi ;; - suse | redhat | debian) -@@ -3016,9 +3019,9 @@ + esac +@@ -3152,9 +3147,8 @@ + echotab "if [ ! -d \$(exec_prefix) ] ; then mkdir \$(exec_prefix) ; fi" + echotab "if [ ! -d \$(docdir) ] ; then mkdir \$(docdir) ; fi" + echotab "if [ ! -d \$(lispdocdir) ] ; then mkdir \$(lispdocdir) ; fi" +- echotab "if [ ! -d \$(lispdocdir)/doc ] ; then mkdir \$(lispdocdir)/doc ; fi" + echotab "\$(INSTALL_DATA) \$(READMES) \$(lispdocdir)/" +- echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(lispdocdir)/doc/" ++ echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(lispdocdir)/" + echol + echol + echol "installcheck : ${TESTSDIR} force" +@@ -3181,18 +3175,14 @@ fi case "$fsstnd" in gnu_ext) -- echotab "\$(RM) \$(mandir)/html/clisp.html" +- echotab "\$(RM) \$(htmldir)/clisp.html" +- if [ $TERMINAL = readline ] ; then +- echotab "\$(RM) \$(htmldir)/clreadline.html" +- fi +- echotab "\$(RM) \$(dvidir)/clisp.dvi" + echotab "\$(RM) \$(prefix)/share/doc/clisp/clisp.html" if [ $TERMINAL = readline ] ; then -- echotab "\$(RM) \$(mandir)/html/clreadline.html" +- echotab "\$(RM) \$(dvidir)/clreadline.dvi" + echotab "\$(RM) \$(prefix)/share/doc/clisp/clreadline.html" fi ;; - suse | redhat | debian) + esac + echotab "for f in \$(READMES); do \$(RM) \$(lispdocdir)/\$\$f; done" +- echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(lispdocdir)/doc/\$\$f; done" ++ echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(lispdocdir)/\$\$f; done" + echol + echol + fi diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab index 93467410283..dc1f5d84689 100644 --- a/lang/clisp/patches/patch-ab +++ b/lang/clisp/patches/patch-ab @@ -1,25 +1,18 @@ -$NetBSD: patch-ab,v 1.1 1999/01/31 23:38:15 tron Exp $ +$NetBSD: patch-ab,v 1.2 1999/12/18 04:53:18 mjl Exp $ -*** ../sigsegv/Makefile.in.orig Sun Jan 31 02:24:53 1999 ---- ../sigsegv/Makefile.in Sun Jan 31 02:25:20 1999 -*************** -*** 76,84 **** - $(CC) $(CFLAGS) $(INCLUDES) $(srcdir)/test3.c libsigsegv.a -o test3 - - check : all test1 test2 test3 -! ./test1 -! ./test2 -! ./test3 - - mostlyclean : clean - ---- 76,84 ---- - $(CC) $(CFLAGS) $(INCLUDES) $(srcdir)/test3.c libsigsegv.a -o test3 - - check : all test1 test2 test3 -! # ./test1 -! # ./test2 -! # ./test3 - - mostlyclean : clean - +--- ../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 index b09b009be65..ee9b908c925 100644 --- a/lang/clisp/patches/patch-ac +++ b/lang/clisp/patches/patch-ac @@ -1,16 +1,16 @@ -$NetBSD: patch-ac,v 1.1 1999/04/17 01:55:55 mjl Exp $ +$NetBSD: patch-ac,v 1.2 1999/12/18 04:53:18 mjl Exp $ ---- ../ffcall/avcall/Makefile.in.orig Sat Apr 17 02:28:04 1999 -+++ ../ffcall/avcall/Makefile.in Sat Apr 17 02:38:43 1999 -@@ -130,10 +130,7 @@ - tests : tests.o $(OBJECTS) - $(CC) $(CFLAGS) tests.o $(OBJECTS) -o tests +--- ../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 : # This test crashes with egcs ++check : # all tests mostlyclean : clean diff --git a/lang/clisp/patches/patch-ad b/lang/clisp/patches/patch-ad index 4c58e9b98df..b716e3e1fb8 100644 --- a/lang/clisp/patches/patch-ad +++ b/lang/clisp/patches/patch-ad @@ -1,16 +1,16 @@ -$NetBSD: patch-ad,v 1.1 1999/04/17 01:55:55 mjl Exp $ +$NetBSD: patch-ad,v 1.2 1999/12/18 04:53:18 mjl Exp $ ---- ../ffcall/callback/Makefile.in.orig Sat Apr 17 02:34:45 1999 -+++ ../ffcall/callback/Makefile.in Sat Apr 17 02:35:02 1999 -@@ -99,10 +99,7 @@ +--- ../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) check + 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 : # Theses tests also fail with egcs. ++check : # Fail with egcs mostlyclean : force - cd @subdir@; $(MAKE) mostlyclean + cd @subdir@; $(MAKE) -r mostlyclean diff --git a/lang/clisp/patches/patch-ae b/lang/clisp/patches/patch-ae index 9546d767ce8..618e58d2979 100644 --- a/lang/clisp/patches/patch-ae +++ b/lang/clisp/patches/patch-ae @@ -1,21 +1,13 @@ -$NetBSD: patch-ae,v 1.1 1999/04/17 01:55:56 mjl Exp $ +$NetBSD: patch-ae,v 1.2 1999/12/18 04:53:18 mjl Exp $ -*** unix.d.orig Sat Apr 17 02:51:01 1999 ---- unix.d Sat Apr 17 02:51:12 1999 -*************** -*** 29,35 **** - # geschützt sein. - #define OS_errno errno - extern int sys_nerr; # Anzahl der Betriebssystem-Fehlermeldungen -! extern SYS_ERRLIST_CONST char* SYS_ERRLIST_CONST sys_errlist[]; # Betriebssystem-Fehlermeldungen - # siehe PERROR(3) - # wird verwendet von ERROR, SPVW, STREAM, PATHNAME - ---- 29,35 ---- - # geschützt sein. - #define OS_errno errno - extern int sys_nerr; # Anzahl der Betriebssystem-Fehlermeldungen -! # extern SYS_ERRLIST_CONST char* SYS_ERRLIST_CONST sys_errlist[]; # Betriebssystem-Fehlermeldungen - # siehe PERROR(3) - # wird verwendet von ERROR, SPVW, STREAM, PATHNAME - +--- unix.d.orig Sat Dec 18 03:35:20 1999 ++++ unix.d Sat Dec 18 03:35:50 1999 +@@ -29,7 +29,7 @@ + # geschützt sein. + #define OS_errno errno + extern int sys_nerr; # Anzahl der Betriebssystem-Fehlermeldungen +- extern SYS_ERRLIST_CONST char* SYS_ERRLIST_CONST sys_errlist[]; # Betriebssystem-Fehlermeldungen ++ # extern SYS_ERRLIST_CONST char* SYS_ERRLIST_CONST sys_errlist[]; # Betriebssystem-Fehlermeldungen + # siehe PERROR(3) + # wird verwendet von ERROR, SPVW, STREAM, PATHNAME + diff --git a/lang/clisp/pkg/PLIST b/lang/clisp/pkg/PLIST index 18b7746799a..3b325334144 100644 --- a/lang/clisp/pkg/PLIST +++ b/lang/clisp/pkg/PLIST @@ -1,15 +1,62 @@ -@comment $NetBSD: PLIST,v 1.2 1999/01/31 23:37:28 tron Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/12/18 04:53:18 mjl Exp $ bin/clisp +lib/clisp/clisp-link lib/clisp/full/lisp.run lib/clisp/full/lispinit.mem -lib/clisp/lisp.run -lib/clisp/lispinit.mem +lib/clisp/full/libavcall.a +lib/clisp/full/libcallback.a +lib/clisp/full/libintl.a +lib/clisp/full/libnoreadline.a +lib/clisp/full/libreadline.a +lib/clisp/full/libsigsegv.a +lib/clisp/full/lisp.a +lib/clisp/full/makevars +lib/clisp/full/modules.h +lib/clisp/full/modules.o +lib/clisp/data/UnicodeData.txt +lib/clisp/linkkit/modules.d +lib/clisp/linkkit/modules.c +lib/clisp/linkkit/clisp.h +lib/clisp/base/libavcall.a +lib/clisp/base/libcallback.a +lib/clisp/base/libintl.a +lib/clisp/base/libnoreadline.a +lib/clisp/base/libreadline.a +lib/clisp/base/libsigsegv.a +lib/clisp/base/lisp.a +lib/clisp/base/lisp.run +lib/clisp/base/lispinit.mem +lib/clisp/base/makevars +lib/clisp/base/modules.h +lib/clisp/base/modules.o @dirrm lib/clisp/full +@dirrm lib/clisp/linkkit +@dirrm lib/clisp/data +@dirrm lib/clisp/base @dirrm lib/clisp man/man1/clisp.1 man/man3/clreadline.3 share/doc/clisp/clisp.html share/doc/clisp/clreadline.html +share/doc/clisp/ANNOUNCE +share/doc/clisp/README.es +share/doc/clisp/README.de +share/doc/clisp/README +share/doc/clisp/NEWS +share/doc/clisp/SUMMARY +share/doc/clisp/GNU-GPL +share/doc/clisp/COPYRIGHT +share/doc/clisp/MAGIC.add +share/doc/clisp/clisp.1 +share/doc/clisp/readline.dvi +share/doc/clisp/clreadline.dvi +share/doc/clisp/clreadline.3 +share/doc/clisp/clisp.gif +share/doc/clisp/impnotes.html +share/doc/clisp/editors.txt +share/doc/clisp/CLOS-guide.txt +share/doc/clisp/LISP-tutorial.txt +share/doc/clisp/clisp.dvi @dirrm share/doc/clisp share/locale/en/LC_MESSAGES/clisp.mo share/locale/de/LC_MESSAGES/clisp.mo -- cgit v1.2.3