From 638981a1fdedef159b2b7808afe290e909d9c48e Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 31 Mar 2001 11:51:05 +0000 Subject: [PATCH] - Update to 2.25. - Pull COMMENT into Makefile. - Switch to .bz2 distfile. - New maintainer; ok jsmith@mcs.drexel.edu. - Doesn't build on powerpc either. Partly submitted by Shell Hung . --- lang/clisp/Makefile | 35 ++++---- lang/clisp/files/md5 | 6 +- lang/clisp/patches/patch-src_lispbibl_d | 15 ++-- lang/clisp/patches/patch-src_makemake_in | 107 +++++++++++++---------- lang/clisp/pkg/COMMENT | 1 - lang/clisp/pkg/DESCR | 30 +++---- lang/clisp/pkg/PLIST | 23 +++-- 7 files changed, 119 insertions(+), 98 deletions(-) delete mode 100644 lang/clisp/pkg/COMMENT diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 69d831c050f..5acdeb0f495 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,41 +1,38 @@ -# $OpenBSD: Makefile,v 1.4 2001/03/30 13:57:06 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2001/03/31 11:51:05 naddy Exp $ # $FreeBSD: ports/lang/clisp/Makefile,v 1.4 2000/05/14 05:40:46 billf Exp $ -NOT_FOR_ARCHS= sparc +NOT_FOR_ARCHS= powerpc sparc +COMMENT= 'ANSI Common Lisp compiler' -DISTNAME= clisp-2000-03-06 -PKGNAME= clisp-20000306 +DISTNAME= clisp-2.25 CATEGORIES= lang -NEED_VERSION= 1.338 +NEED_VERSION= 1.378 HOMEPAGE= http://clisp.cons.org/ -MASTER_SITES= ftp://clisp.cons.org/pub/lisp/clisp/source/ \ - ftp://ftp.freesoftware.com/pub/lisp/clisp/source/ -MAINTAINER= Justin R. Smith +MAINTAINER= Shell Hung PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MASTER_SITES= ftp://clisp.cons.org/pub/lisp/clisp/source/ \ + ftp://ftp.freesoftware.com/pub/lisp/clisp/source/ +EXTRACT_SUFX= .tar.bz2 + CONFIGURE_STYLE= gnu old CONFIGURE_ARGS= --srcdir=${WRKSRC} ${WRKBUILD} SEPARATE_BUILD= concurrent -# The source doesn't include a top-level Makefile, so we'll fake one. -post-extract: - printf "all install:\n\t@cd ${WRKBUILD} && \$${MAKE} \$${MAKEFLAGS} \$$@\n" >${WRKSRC}/Makefile - -post-configure: - cd ${WRKBUILD} && \ - env WRKINST=${WRKINST} ./makemake --fsstnd=bsd \ - --prefix=${PREFIX} --with-readline --with-gettext \ - --with-dynamic-ffi >Makefile && \ - make config.lsp - MAKE_FLAGS= INSTALL='install -c' \ INSTALL_PROGRAM='install -c -s -m 555' \ INSTALL_DATA='install -c -m 644' +post-configure: + @cd ${WRKBUILD} && \ + ./makemake --fsstnd=openbsd --prefix=${PREFIX} --with-readline \ + --with-gettext --with-dynamic-ffi >Makefile && \ + make config.lisp + .include diff --git a/lang/clisp/files/md5 b/lang/clisp/files/md5 index d90ecf06053..45ee3884e86 100644 --- a/lang/clisp/files/md5 +++ b/lang/clisp/files/md5 @@ -1,3 +1,3 @@ -MD5 (clisp-2000-03-06.tar.gz) = d59d7b268d84f4eb0b8cbeb8d5b90094 -RMD160 (clisp-2000-03-06.tar.gz) = 0d56c677bc46e36958b5b55a7629468eaaa58107 -SHA1 (clisp-2000-03-06.tar.gz) = d384d0285da3dcf66b27b53e46686c80cffaf080 +MD5 (clisp-2.25.tar.bz2) = ee23622c2e9c645a3a15c334b109510c +RMD160 (clisp-2.25.tar.bz2) = 7fe40c13fea51791f542cc65e4f7fbec3ddfd2d5 +SHA1 (clisp-2.25.tar.bz2) = 20ab00b6036e4c07f6a3d58b2477ab606ff34bcf diff --git a/lang/clisp/patches/patch-src_lispbibl_d b/lang/clisp/patches/patch-src_lispbibl_d index 42e051667e0..4aba8a36b0e 100644 --- a/lang/clisp/patches/patch-src_lispbibl_d +++ b/lang/clisp/patches/patch-src_lispbibl_d @@ -1,11 +1,9 @@ -$OpenBSD: patch-src_lispbibl_d,v 1.1.1.1 2000/11/18 13:43:27 naddy Exp $ ---- src/lispbibl.d.orig Tue Feb 29 23:22:55 2000 -+++ src/lispbibl.d Mon Oct 9 19:30:02 2000 -@@ -79,7 +79,36 @@ - # Für ANSI-C-Compiler: verwende Präprozessoren comment5, ansidecl +--- src/lispbibl.d.orig Thu Mar 22 23:22:13 2001 ++++ src/lispbibl.d Thu Mar 22 23:22:53 2001 +@@ -78,6 +78,37 @@ # (und evtl. gcc-cpp, ccpaux). -- + +#ifdef __OpenBSD__ +#ifdef __i386__ +#define i386 @@ -36,6 +34,7 @@ $OpenBSD: patch-src_lispbibl_d,v 1.1.1.1 2000/11/18 13:43:27 naddy Exp $ +#define vax +#endif +#endif - # diese Maschine: AMIGA oder ACORN oder DOSPC oder WIN32 oder GENERIC_UNIX - #if (defined(__unix) || defined(__unix__) || defined(_AIX) || defined(sinix) || defined(__MACH__) || defined(__POSIX__)) && !defined(unix) ++ + # diese Maschine: AMIGA oder ACORN oder OS2 oder WIN32 oder GENERIC_UNIX + #if (defined(__unix) || defined(__unix__) || defined(_AIX) || defined(sinix) || defined(__MACH__) || defined(__POSIX__) || defined(__NetBSD__) || defined(__BEOS__)) && !defined(unix) #define unix diff --git a/lang/clisp/patches/patch-src_makemake_in b/lang/clisp/patches/patch-src_makemake_in index 84219258810..d918868c9d2 100644 --- a/lang/clisp/patches/patch-src_makemake_in +++ b/lang/clisp/patches/patch-src_makemake_in @@ -1,53 +1,70 @@ -$OpenBSD: patch-src_makemake_in,v 1.1.1.1 2000/11/18 13:43:27 naddy Exp $ ---- src/makemake.in.orig Mon Mar 6 12:37:21 2000 -+++ src/makemake.in Tue Oct 10 02:20:33 2000 -@@ -1626,6 +1626,12 @@ case "$fsstnd" in - echol "docdir = \$(exec_prefix)${NEXT_}doc" +--- src/makemake.in.orig Fri Mar 16 00:28:34 2001 ++++ src/makemake.in Thu Mar 22 22:33:30 2001 +@@ -1627,6 +1627,12 @@ + echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc" echol "lispdocdir = \$(docdir)${NEXT_}clisp" ;; -+ bsd) ++ openbsd) + echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc" + echol "lispdocdir = \$(docdir)${NEXT_}clisp" + echol "htmldir = \$(lispdocdir)" + echol "dvidir = \$(lispdocdir)" -+ ;; - suse) - echol "docdir = \$(exec_prefix)${NEXT_}doc" - echol "lispdocdir = \$(docdir)${NEXT_}packages${NEXT_}clisp" -@@ -1647,7 +1653,7 @@ if [ -n "$USE_GETTEXT" ] ; then - fi - echol "# The value of following variable is prepended to all the paths for" - echol "# installation. This is useful when preparing a binary distribution." --echol "install_root =" -+echol "install_root =${WRKINST}" - echol - echol "# List of add-on modules:" - echol "# queens the queens function as a separate module" -@@ -3136,7 +3142,6 @@ if [ $CROSS = false ] ; then - 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" - echol - echol "install-bin : lisp${LEXE} lispinit.mem clisp.c force" - echotab "if [ ! -d \$(install_root)\$(prefix) ] ; then mkdir \$(install_root)\$(prefix) ; fi" -@@ -3198,9 +3203,8 @@ if [ $CROSS = false ] ; then - 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)/" - echol - echol - echol "installcheck : ${TESTSDIR} force" -@@ -3238,7 +3242,7 @@ if [ $CROSS = false ] ; then ++ ;; + esac + echol "libdir = \$(exec_prefix)${NEXT_}lib" + echol "lisplibdir = \$(libdir)${NEXT_}clisp" +@@ -3129,14 +3135,14 @@ + echotab "if [ ! -d \$(DESTDIR)\$(htmldir) ] ; then mkdir \$(DESTDIR)\$(htmldir) ; fi" + echotab "if [ ! -d \$(DESTDIR)\$(dvidir) ] ; then mkdir \$(DESTDIR)\$(dvidir) ; fi" + ;; +- netbsd) ++ netbsd | openbsd) + echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir) ] ; then mkdir \$(DESTDIR)\$(lispdocdir) ; 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" - echol - echol - fi + echotab "if [ ! -d \$(DESTDIR)\$(docdir) ] ; then mkdir \$(DESTDIR)\$(docdir) ; fi" + echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir) ] ; then mkdir \$(DESTDIR)\$(lispdocdir) ; fi" + case "$fsstnd" in +- netbsd) ++ netbsd | openbsd) + ;; + *) + echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir)/doc ] ; then mkdir \$(DESTDIR)\$(lispdocdir)/doc ; fi" +@@ -3202,7 +3208,7 @@ + echotab "\$(INSTALL_DATA) clreadline.dvi \$(DESTDIR)\$(dvidir)/clreadline.dvi" + fi + ;; +- netbsd) ++ netbsd | openbsd) + echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir) ] ; then mkdir \$(DESTDIR)\$(lispdocdir) ; fi" + echotab "\$(INSTALL_DATA) clisp.html \$(DESTDIR)\$(lispdocdir)/clisp.html" + if [ $TERMINAL = readline ] ; then +@@ -3221,6 +3227,10 @@ + netbsd) + echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(DESTDIR)\$(lispdocdir)/" + ;; ++ openbsd) ++ echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir) ] ; then mkdir \$(DESTDIR)\$(lispdocdir) ; fi" ++ echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(DESTDIR)\$(lispdocdir)/" ++ ;; + *) + echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir)/doc ] ; then mkdir \$(DESTDIR)\$(lispdocdir)/doc ; fi" + echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(DESTDIR)\$(lispdocdir)/doc/" +@@ -3261,7 +3271,7 @@ + echotab "\$(RM) \$(DESTDIR)\$(dvidir)/clreadline.dvi" + fi + ;; +- netbsd) ++ netbsd | openbsd) + echotab "\$(RM) \$(DESTDIR)\$(lispdocdir)/clisp.html" + if [ $TERMINAL = readline ] ; then + echotab "\$(RM) \$(DESTDIR)\$(lispdocdir)/clreadline.html" +@@ -3270,7 +3280,7 @@ + esac + echotab "for f in \$(READMES); do \$(RM) \$(DESTDIR)\$(lispdocdir)/\$\$f; done" + case "$fsstnd" in +- netbsd) ++ netbsd | openbsd) + echotab "for f in \$(MANUALS)${manual_dvi}; do \$(RM) \$(DESTDIR)\$(lispdocdir)/\$\$f; done" + ;; + *) diff --git a/lang/clisp/pkg/COMMENT b/lang/clisp/pkg/COMMENT deleted file mode 100644 index 19ba785405c..00000000000 --- a/lang/clisp/pkg/COMMENT +++ /dev/null @@ -1 +0,0 @@ -ANSI Common Lisp compiler diff --git a/lang/clisp/pkg/DESCR b/lang/clisp/pkg/DESCR index d4101d2e1da..a7af7cd019e 100644 --- a/lang/clisp/pkg/DESCR +++ b/lang/clisp/pkg/DESCR @@ -1,21 +1,21 @@ -Common Lisp is a high-level, all-purpose, object-oriented, dynamic, -functional programming language. +Common Lisp is a high-level, all-purpose, object-oriented, +dynamic, functional programming language. -CLISP is a Common Lisp implementation by Bruno Haible of Karlsruhe -University and Michael Stoll of Munich University, both in Germany. -It mostly supports the Lisp described in the ANSI Common Lisp -standard. +CLISP is a Common Lisp implementation by Bruno Haible of +Karlsruhe University and Michael Stoll of Munich University, +both in Germany. It mostly supports the Lisp described in the +ANSI Common Lisp standard. -CLISP includes an interpreter, a compiler, a large subset of CLOS, -a foreign language interface, and a socket interface. An X11 -interface is available through CLX and Garnet. Command line editing -is provided by readline. +CLISP includes an interpreter, a compiler, a large subset of +CLOS, a foreign language interface, and a socket interface. +An X11 interface is available through CLX and Garnet. Command +line editing is provided by readline. -CLISP is free software and may be distributed under the terms of -the GNU GPL. You may distribute commercial applications compiled -with CLISP, see file COPYRIGHT in the CLISP distribution. +CLISP is free software and may be distributed under the terms +of the GNU GPL. You may distribute commercial applications +compiled with CLISP, see file COPYRIGHT in the CLISP distribution. -The user interface comes in German, English, French, Spanish and -Dutch, and can be changed at run time. +The user interface comes in German, English, French, Spanish +and Dutch, and can be changed at run time. WWW: ${HOMEPAGE} diff --git a/lang/clisp/pkg/PLIST b/lang/clisp/pkg/PLIST index f2a5cb0e42c..4f6191d5fa0 100644 --- a/lang/clisp/pkg/PLIST +++ b/lang/clisp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2000/11/18 13:43:27 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.2 2001/03/31 11:51:09 naddy Exp $ bin/clisp lib/clisp/base/libavcall.a lib/clisp/base/libcallback.a @@ -15,6 +15,7 @@ lib/clisp/base/modules.h lib/clisp/base/modules.o lib/clisp/clisp-link lib/clisp/data/UnicodeData.txt +lib/clisp/data/clhs.txt lib/clisp/full/libavcall.a lib/clisp/full/libcallback.a lib/clisp/full/libiconv.a @@ -34,31 +35,39 @@ lib/clisp/linkkit/modules.d man/man1/clisp.1 man/man3/clreadline.3 share/doc/clisp/ANNOUNCE +share/doc/clisp/CLOS-guide.txt share/doc/clisp/COPYRIGHT share/doc/clisp/GNU-GPL +share/doc/clisp/LISP-tutorial.txt share/doc/clisp/MAGIC.add share/doc/clisp/NEWS share/doc/clisp/README share/doc/clisp/README.de share/doc/clisp/README.es share/doc/clisp/SUMMARY -share/doc/clisp/CLOS-guide.txt -share/doc/clisp/LISP-tutorial.txt +share/doc/clisp/clisp.1 share/doc/clisp/clisp.dvi share/doc/clisp/clisp.gif share/doc/clisp/clisp.html +share/doc/clisp/clreadline.3 share/doc/clisp/clreadline.dvi share/doc/clisp/clreadline.html share/doc/clisp/editors.txt share/doc/clisp/impnotes.html share/doc/clisp/readline.dvi share/locale/de/LC_MESSAGES/clisp.mo +share/locale/de/LC_MESSAGES/clisplow.mo share/locale/en/LC_MESSAGES/clisp.mo +share/locale/en/LC_MESSAGES/clisplow.mo share/locale/es/LC_MESSAGES/clisp.mo +share/locale/es/LC_MESSAGES/clisplow.mo share/locale/fr/LC_MESSAGES/clisp.mo +share/locale/fr/LC_MESSAGES/clisplow.mo share/locale/nl/LC_MESSAGES/clisp.mo -@dirrm lib/clisp/base -@dirrm lib/clisp/data -@dirrm lib/clisp/full -@dirrm lib/clisp/linkkit +share/locale/nl/LC_MESSAGES/clisplow.mo @dirrm share/doc/clisp +@dirrm lib/clisp/linkkit +@dirrm lib/clisp/full +@dirrm lib/clisp/data +@dirrm lib/clisp/base +@dirrm lib/clisp