summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2002-02-21 04:13:20 +0000
committerdillo <dillo@pkgsrc.org>2002-02-21 04:13:20 +0000
commitc25436c54ab8df2fc2f8909f9d0b5b5e53f828d5 (patch)
treeb45eec404dc1bc3c25124935df1fbdeffee19ce8 /lang
parent3107edfe3a29a9798b96659b69c41dc9dd49799b (diff)
downloadpkgsrc-c25436c54ab8df2fc2f8909f9d0b5b5e53f828d5.tar.gz
Update CLISP to 2.27, based on PR 15224 by Shell Hung, libtool-overridden
and buildlinked by me. Changes: Now distributed under the GPL. All .fas files generated by previous CLISP versions are invalid and must be recompiled. Hostname resolution is now optional in EXT:SOCKET-STREAM-PEER and EXT:SOCKET-STREAM-LOCAL. EXT:SOCKET-STATUS now accepts SOCKET-SERVERs too, and the direction of the checks can be specified. Added install.bat for win32 installation. Fixed handling of circular structs and pointers to functions in the FFI. Fixed binary I/O for streams with element type longer than one byte, but not a whole number of bytes.
Diffstat (limited to 'lang')
-rw-r--r--lang/clisp/Makefile39
-rw-r--r--lang/clisp/PLIST90
-rw-r--r--lang/clisp/distinfo12
-rw-r--r--lang/clisp/patches/patch-aa127
-rw-r--r--lang/clisp/patches/patch-ae13
-rw-r--r--lang/clisp/patches/patch-af13
6 files changed, 87 insertions, 207 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 9cb836a8c2a..2dcd17a795f 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,39 +1,40 @@
-# $NetBSD: Makefile,v 1.22 2002/01/30 11:15:20 agc Exp $
+# $NetBSD: Makefile,v 1.23 2002/02/21 04:13:20 dillo Exp $
-DISTNAME= clisp-2000-03-06
-PKGNAME= clisp-20000306
-PKGREVISION= 1
+DISTNAME= clisp-2.27
CATEGORIES= lang
-MASTER_SITES= ftp://ftp2.cons.org/pub/lisp/clisp/source/ \
- ftp://ftp.tu-darmstadt.de/pub/programming/languages/lisp/clisp/source/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/}
EXTRACT_SUFX= .tar.bz2
-PATCHFILES= clisp-2000-03-06-bugfix1.diff
-PATCH_SITES= ${MASTER_SITES}
-PATCH_DIST_STRIP= -p2
-
MAINTAINER= mjl@netbsd.org
HOMEPAGE= http://clisp.cons.org/
COMMENT= CLISP, a Common Lisp implementation
NOT_FOR_PLATFORM= *-*-alpha # severe LP64 problems
-RESTRICTED= "Contract notify author when selling for profit."
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-
+USE_BUILDLINK_ONLY= YES
+CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
GNU_CONFIGURE= YES
WRKSRC= ${WRKDIR}/${DISTNAME}/src
UNLIMIT_RESOURCES= stacksize
+USE_LIBTOOL= YES
+LIBTOOL_OVERRIDE= ${WRKSRC}/avcall/libtool
+LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/vacall_r/libtool
+LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/libtool
+LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/trampoline_r/libtool
+LIBTOOL_OVERRIDE+= ${WRKSRC}/libiconv/libcharset/libtool
+LIBTOOL_OVERRIDE+= ${WRKSRC}/libiconv/libtool ${WRKSRC}/sigsegv/libtool
do-configure:
cd ${WRKSRC}; \
- (cd ..;${CONFIGURE_SCRIPT} --host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}); \
+ (cd .. ; ${SETENV} ${CONFIGURE_ENV} \
+ ${CONFIGURE_SCRIPT} --host=${MACHINE_GNU_PLATFORM} \
+ --prefix=${PREFIX}); \
./makemake --prefix=${LOCALBASE} --with-readline --with-gettext \
- --with-dynamic-ffi --fsstnd=netbsd >Makefile
+ --with-dynamic-ffi --fsstnd=netbsd >Makefile
-post-install:
- ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/lib/clisp
- ${CHMOD} -R a-w ${PREFIX}/lib/clisp
+pre-build:
+ cd ${WRKSRC}/avcall && ${MAKE}
+ cd ${WRKSRC}/callback && ${MAKE}
+.include "../../devel/readline/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST
index a5c8eccd10d..e8434e84acb 100644
--- a/lang/clisp/PLIST
+++ b/lang/clisp/PLIST
@@ -1,23 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/21 04:13:20 dillo Exp $
bin/clisp
-lib/clisp/clisp-link
-lib/clisp/full/lisp.run
-lib/clisp/full/lispinit.mem
-lib/clisp/full/libavcall.a
-lib/clisp/full/libcallback.a
-lib/clisp/full/libiconv.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/libiconv.a
@@ -31,37 +13,61 @@ 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
+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
+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/lisp.run
+lib/clisp/full/lispinit.mem
+lib/clisp/full/makevars
+lib/clisp/full/modules.h
+lib/clisp/full/modules.o
+lib/clisp/linkkit/clisp.h
+lib/clisp/linkkit/modules.c
+lib/clisp/linkkit/modules.d
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/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/clisp.1
-share/doc/clisp/readline.dvi
-share/doc/clisp/clreadline.dvi
-share/doc/clisp/clreadline.3
+share/doc/clisp/clisp.dvi
share/doc/clisp/clisp.gif
-share/doc/clisp/impnotes.html
+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/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/doc/clisp/impnotes.html
+share/doc/clisp/readline.dvi
share/locale/de/LC_MESSAGES/clisp.mo
-share/locale/fr/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
+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
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 8174c19cc8e..5086efc8354 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:28:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/02/21 04:13:21 dillo Exp $
-SHA1 (clisp-2000-03-06.tar.bz2) = b7158545055995c712d3db231a315e8f76868a5c
-Size (clisp-2000-03-06.tar.bz2) = 7800404 bytes
-SHA1 (clisp-2000-03-06-bugfix1.diff) = 61ed18b5218435b35c05208234b9b48abfdd59bd
-Size (clisp-2000-03-06-bugfix1.diff) = 1196 bytes
-SHA1 (patch-aa) = d05cf6107faf97104478a9019853bb13ed8a7cbf
-SHA1 (patch-ae) = 4aaa91a1342db0b104178e85b8dd145e9bc7281e
-SHA1 (patch-af) = df36dc61ba61e4b69278d516cb3586d96836e77c
+SHA1 (clisp-2.27.tar.bz2) = ee0a9bfcb9c4d86bdcb8e0bfd3b9ff3defe4c1a8
+Size (clisp-2.27.tar.bz2) = 8965902 bytes
+SHA1 (patch-aa) = 1151b28bf18cd4a3137f014c66e6a0d09da1756e
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index ae9911c6cad..b3d3e28af87 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,115 +1,18 @@
-$NetBSD: patch-aa,v 1.8 2000/06/16 23:53:43 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2002/02/21 04:13:21 dillo Exp $
---- 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 ''
- 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 ''
- host='@host@' # something like 'sparc-sun-sunos4'
- host_cpu='@host_cpu@' # something like 'sparc'
- host_vendor='@host_vendor@' # something like 'sun'
-@@ -1118,6 +1118,9 @@
- esac
+--- ../configure.orig Tue May 8 16:09:59 2001
++++ ../configure
+@@ -512,13 +512,6 @@
+ makemake_args="$makemake_args --with-nogettext"
+ fi
fi
+-if test -d $ABS_DIRNAME/avcall -a -d $ABS_DIRNAME/callback; then
+- (cd $ABS_DIRNAME/avcall && make) &&
+- (cd $ABS_DIRNAME/callback && make) &&
+- (cd $ABS_DIRNAME/avcall && make check) &&
+- (cd $ABS_DIRNAME/callback && make check) &&
+- makemake_args="$makemake_args --with-dynamic-ffi"
+-fi
+
+ if test -z "$do_build"; then
-+if [ "$TSYSOS" = "netbsd" ] ; then # NetBSD
-+ 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
-@@ -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)
- 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"
-@@ -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)\$(prefix)/share/doc/clisp/clreadline.html"
-+ fi
-+ ;;
- esac
- 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/"
-+ 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"
-@@ -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"
-+ 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-ae b/lang/clisp/patches/patch-ae
deleted file mode 100644
index 618e58d2979..00000000000
--- a/lang/clisp/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1999/12/18 04:53:18 mjl Exp $
-
---- 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/patches/patch-af b/lang/clisp/patches/patch-af
deleted file mode 100644
index e85cf2110b1..00000000000
--- a/lang/clisp/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/05/27 02:47:15 wiz Exp $
-
---- configure.orig Wed Jan 26 16:24:25 2000
-+++ configure Sat May 27 04:26:57 2000
-@@ -1130,7 +1130,7 @@
- # AIX installbsd doesn't work without option "-g".
- :
- else
-- ac_cv_path_install="$ac_dir/$ac_prog -c"
-+ cl_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
- fi
- fi