pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/clisp Update to 2.44.1, packaged by Aleksej Saushev.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b330b1ee5e8
branches:  trunk
changeset: 539176:1b330b1ee5e8
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Feb 29 19:34:44 2008 +0000

description:
Update to 2.44.1, packaged by Aleksej Saushev.

Major changes from 2.41:
- Use pkgsrc-supplied libffcall
- Use libtool
- New PKG_OPTIONS to enable support for db4, gdbm, gtk2, fastcgi, pcre.
- lots of bugfixes

diffstat:

 lang/clisp/Makefile         |   54 +++++++------------
 lang/clisp/PLIST            |   90 ++++++++++++++++++---------------
 lang/clisp/distinfo         |   22 ++-----
 lang/clisp/options.mk       |  119 ++++++++++++++++++++++++++++++++++++++++++++
 lang/clisp/patches/patch-aa |   43 +++++++--------
 lang/clisp/patches/patch-ab |   35 +++++++-----
 lang/clisp/patches/patch-ac |   13 ----
 lang/clisp/patches/patch-ad |   13 ----
 lang/clisp/patches/patch-ae |   13 ----
 lang/clisp/patches/patch-af |   13 ----
 lang/clisp/patches/patch-ag |   13 ----
 lang/clisp/patches/patch-ah |   18 ------
 lang/clisp/patches/patch-ai |   16 -----
 lang/clisp/patches/patch-aj |   16 -----
 lang/clisp/patches/patch-ak |   13 ----
 lang/clisp/patches/patch-al |   13 ----
 16 files changed, 235 insertions(+), 269 deletions(-)

diffs (truncated from 644 to 300 lines):

diff -r 5e3ced558ed9 -r 1b330b1ee5e8 lang/clisp/Makefile
--- a/lang/clisp/Makefile       Fri Feb 29 19:23:07 2008 +0000
+++ b/lang/clisp/Makefile       Fri Feb 29 19:34:44 2008 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.66 2008/01/30 14:20:54 is Exp $
+# $NetBSD: Makefile,v 1.67 2008/02/29 19:34:44 tnn Exp $
+#
 
-DISTNAME=      clisp-2.41
+DISTNAME=      clisp-2.44.1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clisp/}
-EXTRACT_SUFX=  .tar.bz2
+#EXTRACT_SUFX= .tar.bz2
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    asau%inbox.ru@localhost
 HOMEPAGE=      http://clisp.cons.org/
 COMMENT=       CLISP, a Common Lisp implementation
 
@@ -16,51 +17,36 @@
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-.include "../../mk/bsd.prefs.mk"
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-.if ${OPSYS} == "NetBSD"
-# CLISP doesn't work with jemalloc, which is default in current
-MODULES+=              --with-gmalloc
-.endif
-
-.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
-MODULES+=              --disable-mmap
-.endif
-
-USE_TOOLS+=            dvipdf
+USE_TOOLS+=            dvipdf gmake
 USE_PKGLOCALEDIR=      YES
 BUILD_DIRS=            src
-CONFIGURE_DIRS=                . modules/i18n modules/syscalls modules/pcre modules/rawsock \
-                       modules/readline modules/regexp modules/wildcard modules/zlib
-CONFIGURE_ENV+=                CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} CPPFLAGS=${CPPFLAGS:M*:Q}
 GNU_CONFIGURE=         YES
 UNLIMIT_RESOURCES=     stacksize
 USE_LIBTOOL=           YES
-USE_GNU_READLINE=      YES
-MODULES+=              --with-module=pcre --with-module=rawsock
-MODULES+=              --with-module=wildcard --with-module=zlib
-CONFIGURE_ARGS+=       ${MODULES}
+CONFIGURE_ARGS+=       --fsstnd=netbsd
+CONFIGURE_ARGS+=       --without-included-regex
+CONFIGURE_ARGS+=       --with-gettext
 TEST_TARGET=           check
-MAKE_ENV+=             TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q}
+MAKE_FLAGS+=           docdir=${PREFIX}/share/doc/${PKGNAME}
 MAKE_FLAGS+=           mandir=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=           elispdir="${PREFIX}/share/${PKGNAME}/emacs"
+MAKE_FLAGS+=           vimdir="${PREFIX}/share/${PKGNAME}/vim"
 MAKE_JOBS_SAFE=                no
 
-post-configure:
-       cd ${WRKSRC}/src && \
-       ./makemake --prefix=${PREFIX} --with-readline --with-gettext \
-               --with-dynamic-ffi --fsstnd=netbsd ${MODULES} >Makefile
+.include "../../mk/bsd.prefs.mk"
 
-pre-build:
-       cd ${WRKSRC}/src/avcall && ${MAKE}
-       cd ${WRKSRC}/src/callback && ${MAKE}
+.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=       --disable-mmap
+.endif
+
+.include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsigsegv+=     libsigsegv>=2.4
 .include "../../devel/libsigsegv/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2
-.include "../../devel/zlib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5e3ced558ed9 -r 1b330b1ee5e8 lang/clisp/PLIST
--- a/lang/clisp/PLIST  Fri Feb 29 19:23:07 2008 +0000
+++ b/lang/clisp/PLIST  Fri Feb 29 19:34:44 2008 +0000
@@ -1,75 +1,81 @@
-@comment $NetBSD: PLIST,v 1.12 2007/06/09 06:10:31 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/02/29 19:34:44 tnn Exp $
 bin/clisp
 lib/clisp/base/calls.o
 lib/clisp/base/gettext.o
-lib/clisp/base/libavcall.a
-lib/clisp/base/libcallback.a
-lib/clisp/base/libcharset.a
 lib/clisp/base/libnoreadline.a
 lib/clisp/base/lisp.a
 lib/clisp/base/lisp.run
 lib/clisp/base/lispinit.mem
+lib/clisp/base/localcharset.o
 lib/clisp/base/makevars
 lib/clisp/base/modules.h
 lib/clisp/base/modules.o
 lib/clisp/base/readline.o
-lib/clisp/base/regex.o
 lib/clisp/base/regexi.o
 lib/clisp/base/regexp.dvi
+lib/clisp/base/uniname.o
+lib/clisp/base/width.o
 lib/clisp/clisp-link
 lib/clisp/data/Symbol-Table.text
 lib/clisp/data/UnicodeDataFull.txt
+${bdb}lib/clisp/full/bdb.o
 lib/clisp/full/calls.o
-lib/clisp/full/cpcre.o
+${mit-clx}lib/clisp/full/clx.o
+${new-clx}lib/clisp/full/clx.o
+${pcre}lib/clisp/full/cpcre.o
+${fastcgi}lib/clisp/full/fastcgi.o
+${fastcgi}lib/clisp/full/fastcgi_wrappers.o
 lib/clisp/full/gettext.o
-lib/clisp/full/libavcall.a
-lib/clisp/full/libcallback.a
-lib/clisp/full/libcharset.a
+${gdbm}lib/clisp/full/gdbm.o
+${gtk2}lib/clisp/full/gtk.o
 lib/clisp/full/libnoreadline.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
 lib/clisp/full/lispinit.mem
+lib/clisp/full/localcharset.o
 lib/clisp/full/makevars
 lib/clisp/full/modules.h
 lib/clisp/full/modules.o
-lib/clisp/full/rawsock.o
+${pgsql}lib/clisp/full/postgresql.o
+${rawsock}lib/clisp/full/rawsock.o
 lib/clisp/full/readline.o
-lib/clisp/full/regex.o
 lib/clisp/full/regexi.o
 lib/clisp/full/regexp.dvi
-lib/clisp/full/wildcard.dvi
-lib/clisp/full/wildcard.o
-lib/clisp/full/zlib.o
+lib/clisp/full/uniname.o
+lib/clisp/full/width.o
+${wildcard}lib/clisp/full/wildcard.dvi
+${wildcard}lib/clisp/full/wildcard.o
+${zlib}lib/clisp/full/zlib.o
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
-lib/clisp/linkkit/modules.d
 man/man1/clisp.1
-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/clisp.1
-share/doc/clisp/clisp.dvi
-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/emacs/site-lisp/clhs.el
-share/emacs/site-lisp/clisp-coding.el
-share/emacs/site-lisp/clisp-ffi.el
-share/emacs/site-lisp/clisp-indent.el
-share/emacs/site-lisp/clisp-indent.lisp
+share/${PKGNAME}/emacs/clhs.el
+share/${PKGNAME}/emacs/clisp-coding.el
+share/${PKGNAME}/emacs/clisp-ffi.el
+share/${PKGNAME}/emacs/clisp-indent.el
+share/${PKGNAME}/emacs/clisp-indent.lisp
+share/${PKGNAME}/vim/lisp.vim
+share/doc/${PKGNAME}/ANNOUNCE
+share/doc/${PKGNAME}/CLOS-guide.txt
+share/doc/${PKGNAME}/COPYRIGHT
+share/doc/${PKGNAME}/GNU-GPL
+share/doc/${PKGNAME}/LISP-tutorial.txt
+share/doc/${PKGNAME}/MAGIC.add
+share/doc/${PKGNAME}/NEWS
+share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/README.de
+share/doc/${PKGNAME}/README.es
+share/doc/${PKGNAME}/SUMMARY
+share/doc/${PKGNAME}/clisp.1
+share/doc/${PKGNAME}/clisp.dvi
+share/doc/${PKGNAME}/clisp.html
+share/doc/${PKGNAME}/clisp.pdf
+share/doc/${PKGNAME}/clisp.png
+share/doc/${PKGNAME}/clisp.ps
+share/doc/${PKGNAME}/editors.txt
+share/doc/${PKGNAME}/impnotes.css
+share/doc/${PKGNAME}/impnotes.html
 share/locale/da/LC_MESSAGES/clisp.mo
 share/locale/da/LC_MESSAGES/clisplow.mo
 share/locale/de/LC_MESSAGES/clisp.mo
@@ -84,7 +90,9 @@
 share/locale/nl/LC_MESSAGES/clisplow.mo
 share/locale/ru/LC_MESSAGES/clisp.mo
 share/locale/ru/LC_MESSAGES/clisplow.mo
-@dirrm share/doc/clisp
+@dirrm share/doc/${PKGNAME}
+@dirrm share/${PKGNAME}/vim
+@dirrm share/${PKGNAME}/emacs
 @dirrm lib/clisp/linkkit
 @dirrm lib/clisp/full
 @dirrm lib/clisp/data
diff -r 5e3ced558ed9 -r 1b330b1ee5e8 lang/clisp/distinfo
--- a/lang/clisp/distinfo       Fri Feb 29 19:23:07 2008 +0000
+++ b/lang/clisp/distinfo       Fri Feb 29 19:34:44 2008 +0000
@@ -1,17 +1,7 @@
-$NetBSD: distinfo,v 1.17 2007/06/09 06:10:31 obache Exp $
+$NetBSD: distinfo,v 1.18 2008/02/29 19:34:44 tnn Exp $
 
-SHA1 (clisp-2.41.tar.bz2) = 0f53703d45807c10e0398fc85352ed605ee566a3
-RMD160 (clisp-2.41.tar.bz2) = e98ee7142c01e946f242360c7495df5668694d34
-Size (clisp-2.41.tar.bz2) = 8319471 bytes
-SHA1 (patch-aa) = 3d9679606bfd6598353418ae6d4182a7f4393a5e
-SHA1 (patch-ab) = fd045706d0cbcf6fd417eba5636d11ab1d3e9329
-SHA1 (patch-ac) = 8e784d081c8ea276661b5a11ded5d856d3b2dfdc
-SHA1 (patch-ad) = aa5cf0719299e0b8c59cdf19c52cadb9451204cf
-SHA1 (patch-ae) = e6766368b19b0d2e6ac21e9919dfb88e792caa03
-SHA1 (patch-af) = 2919a13a8ca8266f5d608f4dbe35f14803c7595d
-SHA1 (patch-ag) = f3ce92e3f0806197015b971cce24311a5a447050
-SHA1 (patch-ah) = 6a607e00e1815fe332325a91865889a03c60c3a0
-SHA1 (patch-ai) = 8291cfd4c27cbb22d5a72168cdb21c6d26400f54
-SHA1 (patch-aj) = 37af4382519ddb21587006789165ba1173e17577
-SHA1 (patch-ak) = d9bdea2e480e8ea5fbe7e703dfce62fe47b9b7e7
-SHA1 (patch-al) = 90ec5cc5028dba1ecda7d499def88303cbff2d2a
+SHA1 (clisp-2.44.1.tar.gz) = 08cbf5a2f94fa1e6f29e1563e10e200f8dee8690
+RMD160 (clisp-2.44.1.tar.gz) = adf762a6df98a677da9393a52ee9a02c0e1ead09
+Size (clisp-2.44.1.tar.gz) = 8950346 bytes
+SHA1 (patch-aa) = d2f1de2e0f3e02ccf4ece2a7b1ed0ce6ba025af2
+SHA1 (patch-ab) = 6559df5aaa12af5a62da7c82d08678f642845453
diff -r 5e3ced558ed9 -r 1b330b1ee5e8 lang/clisp/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/options.mk     Fri Feb 29 19:34:44 2008 +0000
@@ -0,0 +1,119 @@
+# $NetBSD: options.mk,v 1.1 2008/02/29 19:34:44 tnn Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.clisp
+
+# this option is essential for some others to work:
+PKG_SUPPORTED_OPTIONS+=                ffcall
+
+PKG_SUPPORTED_OPTIONS+=                pgsql gdbm bdb pcre rawsock pari fastcgi wildcard gtk2 zlib
+PKG_SUPPORTED_OPTIONS+=                readline
+
+PKG_OPTIONS_OPTIONAL_GROUPS=   x11-bindings
+PKG_OPTIONS_GROUP.x11-bindings=        mit-clx new-clx
+
+PKG_SUPPORTED_OPTIONS+=                gmalloc
+
+PKG_SUGGESTED_OPTIONS+=                ffcall pcre rawsock readline zlib
+
+# CLISP doesn't work with jemalloc:
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+=                gmalloc
+.elif ${OPSYS} == "FreeBSD" && !empty(OS_VERSION:N[0-6].*)
+PKG_SUGGESTED_OPTIONS+=                gmalloc
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.for option in ${PKG_SUPPORTED_OPTIONS}
+.  if !empty(PKG_OPTIONS:M${option})
+PLIST_SUBST+=  ${option}=""
+.  else
+PLIST_SUBST+=  ${option}="@comment "
+.  endif
+.endfor
+
+.if !empty(PKG_OPTIONS:Mgmalloc)
+CONFIGURE_ARGS+=       --with-gmalloc
+.endif
+
+# ffcall is required for other options to work
+.if !empty(PKG_OPTIONS:Mpgsql) && empty(PKG_OPTIONS:Mffcall)
+PKG_OPTIONS+=  ffcall
+.endif
+
+.if !empty(PKG_OPTIONS:Mffcall)
+CONFIGURE_ARGS+=       --with-dynamic-ffi



Home | Main Index | Thread Index | Old Index