diff options
Diffstat (limited to 'lang/clisp')
-rw-r--r-- | lang/clisp/Makefile | 14 | ||||
-rw-r--r-- | lang/clisp/PLIST | 4 | ||||
-rw-r--r-- | lang/clisp/distinfo | 10 | ||||
-rw-r--r-- | lang/clisp/patches/patch-aa | 51 |
4 files changed, 58 insertions, 21 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 7052e07a0e2..f3b2d6fc1e9 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2009/08/26 19:58:45 sno Exp $ +# $NetBSD: Makefile,v 1.75 2009/12/15 23:22:06 asau Exp $ # -DISTNAME= clisp-2.47 -PKGREVISION= 2 +DISTNAME= clisp-2.48 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/} #EXTRACT_SUFX= .tar.bz2 @@ -10,6 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/} MAINTAINER= asau@inbox.ru HOMEPAGE= http://clisp.cons.org/ COMMENT= CLISP, a Common Lisp implementation +LICENSE= gnu-gpl-v2 # Sparc64 has assembler code problems, see # http://sourceforge.net/tracker/index.php?func=detail&aid=952681&group_id=1355&atid=101355 @@ -22,15 +22,15 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no +GNU_CONFIGURE= yes CONFIGURE_DIRS= . -USE_GNU_CONFIGURE_HOST= NO # work around broken reasoning: "configure --host=..." => cross-building +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes BUILD_DIRS= src -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -USE_PKGLOCALEDIR= YES USE_TOOLS+= dvipdf UNLIMIT_RESOURCES= stacksize +USE_GNU_CONFIGURE_HOST= NO # work around broken reasoning: "configure --host=..." => cross-building CONFIGURE_ARGS+= --disable-maintainer-mode CONFIGURE_ARGS+= --fsstnd=netbsd CONFIGURE_ARGS+= --without-included-regex diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST index 65420758b0c..4c9a3cbd6cb 100644 --- a/lang/clisp/PLIST +++ b/lang/clisp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:03:29 joerg Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/12/15 23:22:06 asau Exp $ bin/clisp lib/clisp/base/calls.o lib/clisp/base/gettext.o @@ -50,6 +50,7 @@ lib/clisp/linkkit/clisp.h lib/clisp/linkkit/modprep.lisp lib/clisp/linkkit/modules.c man/man1/clisp.1 +share/aclocal/clisp.m4 share/clisp/emacs/clhs.el share/clisp/emacs/clisp-coding.el share/clisp/emacs/clisp-ffi.el @@ -73,7 +74,6 @@ share/doc/clisp/clisp.html share/doc/clisp/clisp.pdf share/doc/clisp/clisp.png share/doc/clisp/clisp.ps -share/doc/clisp/editors.txt share/doc/clisp/impnotes.css share/doc/clisp/impnotes.html share/locale/da/LC_MESSAGES/clisp.mo diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo index d962eb8776e..46ee9084c36 100644 --- a/lang/clisp/distinfo +++ b/lang/clisp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.23 2008/10/27 18:07:23 tnn Exp $ +$NetBSD: distinfo,v 1.24 2009/12/15 23:22:06 asau Exp $ -SHA1 (clisp-2.47.tar.gz) = 537222b2633a09847bd9864bcfe68e69a856f08b -RMD160 (clisp-2.47.tar.gz) = e084fbd9b77266f36655789c42f91653cb06365c -Size (clisp-2.47.tar.gz) = 9175929 bytes -SHA1 (patch-aa) = d2f1de2e0f3e02ccf4ece2a7b1ed0ce6ba025af2 +SHA1 (clisp-2.48.tar.gz) = ad4e1bcdb1e5bedbb1981269b887eb8ed7edac23 +RMD160 (clisp-2.48.tar.gz) = 28d6b89326249fd82c0c09d8f0711e6cf4c14919 +Size (clisp-2.48.tar.gz) = 9599162 bytes +SHA1 (patch-aa) = a55f88c1b8924fa4bdb60209172c8405912ae6b4 diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa index ae58d92a3c4..ffe8de31ba6 100644 --- a/lang/clisp/patches/patch-aa +++ b/lang/clisp/patches/patch-aa @@ -1,19 +1,46 @@ -$NetBSD: patch-aa,v 1.16 2008/02/29 19:34:44 tnn Exp $ +$NetBSD: patch-aa,v 1.17 2009/12/15 23:22:06 asau Exp $ +Override library subdirectory name for consistency. Don't use cache file to avoid trailing space problem. +Fix scripts installation. ---- src/makemake.in.orig 2008-01-03 20:28:49.000000000 +0100 -+++ src/makemake.in -@@ -1881,6 +1881,7 @@ echol "psdir = ${PSDIR}" +--- src/makemake.in.orig 2009-07-28 17:58:03.000000000 +0400 ++++ src/makemake.in 2009-12-15 22:06:10.000000000 +0300 +@@ -538,6 +538,7 @@ + RANLIB='@RANLIB@' # either 'ranlib' or ':' + INSTALL='@INSTALL@' # either 'install -c' or 'cp' + INSTALL_PROGRAM='@INSTALL_PROGRAM@' # either 'install -c' or 'cp' ++INSTALL_SCRIPT='@INSTALL_SCRIPT@' # as above only never strip + INSTALL_DATA='@INSTALL_DATA@' # either 'install -c -m 644' or 'cp' + GROFF='@GROFF@' # either 'groff' or '' + DVIPDF='@DVIPDF@' # either 'dvipdf' or '' +@@ -995,6 +996,7 @@ + if [ -z "$INSTALL" ] ; then + INSTALL=$CP + INSTALL_PROGRAM='$(INSTALL)' ++ INSTALL_SCRIPT='$(INSTALL)' + INSTALL_DATA='$(INSTALL)' + fi + +@@ -1930,7 +1932,7 @@ + echol "psdir = ${PSDIR}" echol "pdfdir = ${PDFDIR}" echol "libdir = ${LIBDIR}" - echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)" +-echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)" +echol "lisplibdir = \$(libdir)${NEXT_}clisp" if [ -n "$USE_GETTEXT" ] ; then echol "localedir = ${LOCALEDIR}" fi -@@ -3342,7 +3343,7 @@ echotab " if test \"\$\${ac_cv_env_ - echotab " if test \"\$\${ac_cv_env_CFLAGS_set}\" = set; then CFLAGS=\"\$\${ac_cv_env_CFLAGS_value}\"; export CFLAGS; fi; \\" +@@ -2082,6 +2084,7 @@ + echol '# Programs used by "make install":' + echol "INSTALL = ${INSTALL}" + echol "INSTALL_PROGRAM = ${INSTALL_PROGRAM}" ++echol "INSTALL_SCRIPT = ${INSTALL_SCRIPT}" + echol "INSTALL_DATA = ${INSTALL_DATA}" + echol + echol '# Programs used by "make distrib":' +@@ -3348,7 +3351,7 @@ + done # we must use $(SHELL) for sub-configures because when the top CONFIG_SHELL # is bash, config.cache may be unparsable with sh on Solaris -echotab " \$(SHELL) ./configure --cache-file=\$\${cache} --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\" @@ -21,3 +48,13 @@ Don't use cache file to avoid trailing space problem. echotab " else \$(SHELL) ./configure --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS); \\" echotab " fi ) ;\\" echotab "fi" +@@ -3608,7 +3611,8 @@ + echotab "(cd \$(DESTDIR)\$(lisplibdir) && \$(RMRF) base full)" + echotab "mkdir \$(DESTDIR)\$(lisplibdir)/base" + echotab "mkdir \$(DESTDIR)\$(lisplibdir)/full" +- echotab "for f in clisp-link linkkit/* base/* full/*; do \\" ++ echotab "\$(INSTALL_SCRIPT) clisp-link \$(DESTDIR)\$(lisplibdir)/clisp-link" ++ echotab "for f in linkkit/* base/* full/*; do \\" + echotab " case \$\$f in \\" + echotab " */lisp${LEXE}|clisp-link) \$(INSTALL_PROGRAM) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f;; \\" + echotab " *) \$(INSTALL_DATA) \$\$f \$(DESTDIR)\$(lisplibdir)/\$\$f;; \\" |