Fri Feb 29 19:34:45 2008 UTC ()
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


(tnn)
diff -r1.66 -r1.67 pkgsrc/lang/clisp/Makefile
diff -r1.12 -r1.13 pkgsrc/lang/clisp/PLIST
diff -r1.17 -r1.18 pkgsrc/lang/clisp/distinfo
diff -r0 -r1.1 pkgsrc/lang/clisp/options.mk
diff -r1.15 -r1.16 pkgsrc/lang/clisp/patches/patch-aa
diff -r1.12 -r1.13 pkgsrc/lang/clisp/patches/patch-ab
diff -r1.8 -r0 pkgsrc/lang/clisp/patches/patch-ac
diff -r1.8 -r0 pkgsrc/lang/clisp/patches/patch-ad
diff -r1.8 -r0 pkgsrc/lang/clisp/patches/patch-ae
diff -r1.7 -r0 pkgsrc/lang/clisp/patches/patch-af
diff -r1.5 -r0 pkgsrc/lang/clisp/patches/patch-ag
diff -r1.5 -r0 pkgsrc/lang/clisp/patches/patch-ah
diff -r1.5 -r0 pkgsrc/lang/clisp/patches/patch-ai
diff -r1.4 -r0 pkgsrc/lang/clisp/patches/patch-aj
diff -r1.6 -r0 pkgsrc/lang/clisp/patches/patch-ak
diff -r1.2 -r0 pkgsrc/lang/clisp/patches/patch-al
cvs diff -r1.66 -r1.67 pkgsrc/lang/clisp/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/clisp/Makefile 2008/01/30 14:20:54 1.66
+++ pkgsrc/lang/clisp/Makefile 2008/02/29 19:34:44 1.67
@@ -1,66 +1,52 @@ @@ -1,66 +1,52 @@
1# $NetBSD: Makefile,v 1.66 2008/01/30 14:20:54 is Exp $ 1# $NetBSD: Makefile,v 1.67 2008/02/29 19:34:44 tnn Exp $
 2#
2 3
3DISTNAME= clisp-2.41 4DISTNAME= clisp-2.44.1
4CATEGORIES= lang 5CATEGORIES= lang
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/}
6EXTRACT_SUFX= .tar.bz2 7#EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= asau@inbox.ru
9HOMEPAGE= http://clisp.cons.org/ 10HOMEPAGE= http://clisp.cons.org/
10COMMENT= CLISP, a Common Lisp implementation 11COMMENT= CLISP, a Common Lisp implementation
11 12
12# Sparc64 has assembler code problems, see 13# Sparc64 has assembler code problems, see
13# http://sourceforge.net/tracker/index.php?func=detail&aid=952681&group_id=1355&atid=101355 14# http://sourceforge.net/tracker/index.php?func=detail&aid=952681&group_id=1355&atid=101355
14NOT_FOR_PLATFORM= *-*-sparc64 15NOT_FOR_PLATFORM= *-*-sparc64
15NOT_FOR_PLATFORM+= *-*-arm 16NOT_FOR_PLATFORM+= *-*-arm
16 17
17PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
18 19
19.include "../../mk/bsd.prefs.mk" 20PKG_DESTDIR_SUPPORT= user-destdir
20 
21.if ${OPSYS} == "NetBSD" 
22# CLISP doesn't work with jemalloc, which is default in current 
23MODULES+= --with-gmalloc 
24.endif 
25 
26.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly" 
27MODULES+= --disable-mmap 
28.endif 
29 21
30USE_TOOLS+= dvipdf 22USE_TOOLS+= dvipdf gmake
31USE_PKGLOCALEDIR= YES 23USE_PKGLOCALEDIR= YES
32BUILD_DIRS= src 24BUILD_DIRS= src
33CONFIGURE_DIRS= . modules/i18n modules/syscalls modules/pcre modules/rawsock \ 
34 modules/readline modules/regexp modules/wildcard modules/zlib 
35CONFIGURE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} CPPFLAGS=${CPPFLAGS:M*:Q} 
36GNU_CONFIGURE= YES 25GNU_CONFIGURE= YES
37UNLIMIT_RESOURCES= stacksize 26UNLIMIT_RESOURCES= stacksize
38USE_LIBTOOL= YES 27USE_LIBTOOL= YES
39USE_GNU_READLINE= YES 28CONFIGURE_ARGS+= --fsstnd=netbsd
40MODULES+= --with-module=pcre --with-module=rawsock 29CONFIGURE_ARGS+= --without-included-regex
41MODULES+= --with-module=wildcard --with-module=zlib 30CONFIGURE_ARGS+= --with-gettext
42CONFIGURE_ARGS+= ${MODULES} 
43TEST_TARGET= check 31TEST_TARGET= check
44MAKE_ENV+= TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q} 32MAKE_FLAGS+= docdir=${PREFIX}/share/doc/${PKGNAME}
45MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 33MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
 34MAKE_FLAGS+= elispdir="${PREFIX}/share/${PKGNAME}/emacs"
 35MAKE_FLAGS+= vimdir="${PREFIX}/share/${PKGNAME}/vim"
46MAKE_JOBS_SAFE= no 36MAKE_JOBS_SAFE= no
47 37
48post-configure: 38.include "../../mk/bsd.prefs.mk"
49 cd ${WRKSRC}/src && \ 39
50 ./makemake --prefix=${PREFIX} --with-readline --with-gettext \ 40.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
51 --with-dynamic-ffi --fsstnd=netbsd ${MODULES} >Makefile 41CONFIGURE_ARGS+= --disable-mmap
52 42.endif
53pre-build: 43
54 cd ${WRKSRC}/src/avcall && ${MAKE} 44.include "options.mk"
55 cd ${WRKSRC}/src/callback && ${MAKE} 
56 45
57.include "../../converters/libiconv/buildlink3.mk" 46.include "../../converters/libiconv/buildlink3.mk"
58.include "../../devel/gettext-lib/buildlink3.mk" 47.include "../../devel/gettext-lib/buildlink3.mk"
 48.include "../../devel/glib2/buildlink3.mk"
59BUILDLINK_API_DEPENDS.libsigsegv+= libsigsegv>=2.4 49BUILDLINK_API_DEPENDS.libsigsegv+= libsigsegv>=2.4
60.include "../../devel/libsigsegv/buildlink3.mk" 50.include "../../devel/libsigsegv/buildlink3.mk"
61.include "../../devel/readline/buildlink3.mk" 
62.include "../../devel/pcre/buildlink3.mk" 
63BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2 
64.include "../../devel/zlib/buildlink3.mk" 
65 51
66.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/lang/clisp/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/clisp/PLIST 2007/06/09 06:10:31 1.12
+++ pkgsrc/lang/clisp/PLIST 2008/02/29 19:34:44 1.13
@@ -1,92 +1,100 @@ @@ -1,92 +1,100 @@
1@comment $NetBSD: PLIST,v 1.12 2007/06/09 06:10:31 obache Exp $ 1@comment $NetBSD: PLIST,v 1.13 2008/02/29 19:34:44 tnn Exp $
2bin/clisp 2bin/clisp
3lib/clisp/base/calls.o 3lib/clisp/base/calls.o
4lib/clisp/base/gettext.o 4lib/clisp/base/gettext.o
5lib/clisp/base/libavcall.a 
6lib/clisp/base/libcallback.a 
7lib/clisp/base/libcharset.a 
8lib/clisp/base/libnoreadline.a 5lib/clisp/base/libnoreadline.a
9lib/clisp/base/lisp.a 6lib/clisp/base/lisp.a
10lib/clisp/base/lisp.run 7lib/clisp/base/lisp.run
11lib/clisp/base/lispinit.mem 8lib/clisp/base/lispinit.mem
 9lib/clisp/base/localcharset.o
12lib/clisp/base/makevars 10lib/clisp/base/makevars
13lib/clisp/base/modules.h 11lib/clisp/base/modules.h
14lib/clisp/base/modules.o 12lib/clisp/base/modules.o
15lib/clisp/base/readline.o 13lib/clisp/base/readline.o
16lib/clisp/base/regex.o 
17lib/clisp/base/regexi.o 14lib/clisp/base/regexi.o
18lib/clisp/base/regexp.dvi 15lib/clisp/base/regexp.dvi
 16lib/clisp/base/uniname.o
 17lib/clisp/base/width.o
19lib/clisp/clisp-link 18lib/clisp/clisp-link
20lib/clisp/data/Symbol-Table.text 19lib/clisp/data/Symbol-Table.text
21lib/clisp/data/UnicodeDataFull.txt 20lib/clisp/data/UnicodeDataFull.txt
 21${bdb}lib/clisp/full/bdb.o
22lib/clisp/full/calls.o 22lib/clisp/full/calls.o
23lib/clisp/full/cpcre.o 23${mit-clx}lib/clisp/full/clx.o
 24${new-clx}lib/clisp/full/clx.o
 25${pcre}lib/clisp/full/cpcre.o
 26${fastcgi}lib/clisp/full/fastcgi.o
 27${fastcgi}lib/clisp/full/fastcgi_wrappers.o
24lib/clisp/full/gettext.o 28lib/clisp/full/gettext.o
25lib/clisp/full/libavcall.a 29${gdbm}lib/clisp/full/gdbm.o
26lib/clisp/full/libcallback.a 30${gtk2}lib/clisp/full/gtk.o
27lib/clisp/full/libcharset.a 
28lib/clisp/full/libnoreadline.a 31lib/clisp/full/libnoreadline.a
29lib/clisp/full/lisp.a 32lib/clisp/full/lisp.a
30lib/clisp/full/lisp.run 33lib/clisp/full/lisp.run
31lib/clisp/full/lispinit.mem 34lib/clisp/full/lispinit.mem
 35lib/clisp/full/localcharset.o
32lib/clisp/full/makevars 36lib/clisp/full/makevars
33lib/clisp/full/modules.h 37lib/clisp/full/modules.h
34lib/clisp/full/modules.o 38lib/clisp/full/modules.o
35lib/clisp/full/rawsock.o 39${pgsql}lib/clisp/full/postgresql.o
 40${rawsock}lib/clisp/full/rawsock.o
36lib/clisp/full/readline.o 41lib/clisp/full/readline.o
37lib/clisp/full/regex.o 
38lib/clisp/full/regexi.o 42lib/clisp/full/regexi.o
39lib/clisp/full/regexp.dvi 43lib/clisp/full/regexp.dvi
40lib/clisp/full/wildcard.dvi 44lib/clisp/full/uniname.o
41lib/clisp/full/wildcard.o 45lib/clisp/full/width.o
42lib/clisp/full/zlib.o 46${wildcard}lib/clisp/full/wildcard.dvi
 47${wildcard}lib/clisp/full/wildcard.o
 48${zlib}lib/clisp/full/zlib.o
43lib/clisp/linkkit/clisp.h 49lib/clisp/linkkit/clisp.h
44lib/clisp/linkkit/modprep.lisp 50lib/clisp/linkkit/modprep.lisp
45lib/clisp/linkkit/modules.c 51lib/clisp/linkkit/modules.c
46lib/clisp/linkkit/modules.d 
47man/man1/clisp.1 52man/man1/clisp.1
48share/doc/clisp/ANNOUNCE 53share/${PKGNAME}/emacs/clhs.el
49share/doc/clisp/CLOS-guide.txt 54share/${PKGNAME}/emacs/clisp-coding.el
50share/doc/clisp/COPYRIGHT 55share/${PKGNAME}/emacs/clisp-ffi.el
51share/doc/clisp/GNU-GPL 56share/${PKGNAME}/emacs/clisp-indent.el
52share/doc/clisp/LISP-tutorial.txt 57share/${PKGNAME}/emacs/clisp-indent.lisp
53share/doc/clisp/MAGIC.add 58share/${PKGNAME}/vim/lisp.vim
54share/doc/clisp/NEWS 59share/doc/${PKGNAME}/ANNOUNCE
55share/doc/clisp/README 60share/doc/${PKGNAME}/CLOS-guide.txt
56share/doc/clisp/README.de 61share/doc/${PKGNAME}/COPYRIGHT
57share/doc/clisp/README.es 62share/doc/${PKGNAME}/GNU-GPL
58share/doc/clisp/SUMMARY 63share/doc/${PKGNAME}/LISP-tutorial.txt
59share/doc/clisp/clisp.1 64share/doc/${PKGNAME}/MAGIC.add
60share/doc/clisp/clisp.dvi 65share/doc/${PKGNAME}/NEWS
61share/doc/clisp/clisp.html 66share/doc/${PKGNAME}/README
62share/doc/clisp/clisp.pdf 67share/doc/${PKGNAME}/README.de
63share/doc/clisp/clisp.png 68share/doc/${PKGNAME}/README.es
64share/doc/clisp/clisp.ps 69share/doc/${PKGNAME}/SUMMARY
65share/doc/clisp/editors.txt 70share/doc/${PKGNAME}/clisp.1
66share/doc/clisp/impnotes.css 71share/doc/${PKGNAME}/clisp.dvi
67share/doc/clisp/impnotes.html 72share/doc/${PKGNAME}/clisp.html
68share/emacs/site-lisp/clhs.el 73share/doc/${PKGNAME}/clisp.pdf
69share/emacs/site-lisp/clisp-coding.el 74share/doc/${PKGNAME}/clisp.png
70share/emacs/site-lisp/clisp-ffi.el 75share/doc/${PKGNAME}/clisp.ps
71share/emacs/site-lisp/clisp-indent.el 76share/doc/${PKGNAME}/editors.txt
72share/emacs/site-lisp/clisp-indent.lisp 77share/doc/${PKGNAME}/impnotes.css
 78share/doc/${PKGNAME}/impnotes.html
73share/locale/da/LC_MESSAGES/clisp.mo 79share/locale/da/LC_MESSAGES/clisp.mo
74share/locale/da/LC_MESSAGES/clisplow.mo 80share/locale/da/LC_MESSAGES/clisplow.mo
75share/locale/de/LC_MESSAGES/clisp.mo 81share/locale/de/LC_MESSAGES/clisp.mo
76share/locale/de/LC_MESSAGES/clisplow.mo 82share/locale/de/LC_MESSAGES/clisplow.mo
77share/locale/en/LC_MESSAGES/clisp.mo 83share/locale/en/LC_MESSAGES/clisp.mo
78share/locale/en/LC_MESSAGES/clisplow.mo 84share/locale/en/LC_MESSAGES/clisplow.mo
79share/locale/es/LC_MESSAGES/clisp.mo 85share/locale/es/LC_MESSAGES/clisp.mo
80share/locale/es/LC_MESSAGES/clisplow.mo 86share/locale/es/LC_MESSAGES/clisplow.mo
81share/locale/fr/LC_MESSAGES/clisp.mo 87share/locale/fr/LC_MESSAGES/clisp.mo
82share/locale/fr/LC_MESSAGES/clisplow.mo 88share/locale/fr/LC_MESSAGES/clisplow.mo
83share/locale/nl/LC_MESSAGES/clisp.mo 89share/locale/nl/LC_MESSAGES/clisp.mo
84share/locale/nl/LC_MESSAGES/clisplow.mo 90share/locale/nl/LC_MESSAGES/clisplow.mo
85share/locale/ru/LC_MESSAGES/clisp.mo 91share/locale/ru/LC_MESSAGES/clisp.mo
86share/locale/ru/LC_MESSAGES/clisplow.mo 92share/locale/ru/LC_MESSAGES/clisplow.mo
87@dirrm share/doc/clisp 93@dirrm share/doc/${PKGNAME}
 94@dirrm share/${PKGNAME}/vim
 95@dirrm share/${PKGNAME}/emacs
88@dirrm lib/clisp/linkkit 96@dirrm lib/clisp/linkkit
89@dirrm lib/clisp/full 97@dirrm lib/clisp/full
90@dirrm lib/clisp/data 98@dirrm lib/clisp/data
91@dirrm lib/clisp/base 99@dirrm lib/clisp/base
92@dirrm lib/clisp 100@dirrm lib/clisp
cvs diff -r1.17 -r1.18 pkgsrc/lang/clisp/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/clisp/distinfo 2007/06/09 06:10:31 1.17
+++ pkgsrc/lang/clisp/distinfo 2008/02/29 19:34:44 1.18
@@ -1,17 +1,7 @@ @@ -1,17 +1,7 @@
1$NetBSD: distinfo,v 1.17 2007/06/09 06:10:31 obache Exp $ 1$NetBSD: distinfo,v 1.18 2008/02/29 19:34:44 tnn Exp $
2 2
3SHA1 (clisp-2.41.tar.bz2) = 0f53703d45807c10e0398fc85352ed605ee566a3 3SHA1 (clisp-2.44.1.tar.gz) = 08cbf5a2f94fa1e6f29e1563e10e200f8dee8690
4RMD160 (clisp-2.41.tar.bz2) = e98ee7142c01e946f242360c7495df5668694d34 4RMD160 (clisp-2.44.1.tar.gz) = adf762a6df98a677da9393a52ee9a02c0e1ead09
5Size (clisp-2.41.tar.bz2) = 8319471 bytes 5Size (clisp-2.44.1.tar.gz) = 8950346 bytes
6SHA1 (patch-aa) = 3d9679606bfd6598353418ae6d4182a7f4393a5e 6SHA1 (patch-aa) = d2f1de2e0f3e02ccf4ece2a7b1ed0ce6ba025af2
7SHA1 (patch-ab) = fd045706d0cbcf6fd417eba5636d11ab1d3e9329 7SHA1 (patch-ab) = 6559df5aaa12af5a62da7c82d08678f642845453
8SHA1 (patch-ac) = 8e784d081c8ea276661b5a11ded5d856d3b2dfdc 
9SHA1 (patch-ad) = aa5cf0719299e0b8c59cdf19c52cadb9451204cf 
10SHA1 (patch-ae) = e6766368b19b0d2e6ac21e9919dfb88e792caa03 
11SHA1 (patch-af) = 2919a13a8ca8266f5d608f4dbe35f14803c7595d 
12SHA1 (patch-ag) = f3ce92e3f0806197015b971cce24311a5a447050 
13SHA1 (patch-ah) = 6a607e00e1815fe332325a91865889a03c60c3a0 
14SHA1 (patch-ai) = 8291cfd4c27cbb22d5a72168cdb21c6d26400f54 
15SHA1 (patch-aj) = 37af4382519ddb21587006789165ba1173e17577 
16SHA1 (patch-ak) = d9bdea2e480e8ea5fbe7e703dfce62fe47b9b7e7 
17SHA1 (patch-al) = 90ec5cc5028dba1ecda7d499def88303cbff2d2a 
File Added: pkgsrc/lang/clisp/options.mk
# $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
.  include "../../devel/ffcall/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mpgsql)
CONFIGURE_ARGS+=	--with-module=postgresql
.  include "../../mk/pgsql.buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mgdbm)
CONFIGURE_ARGS+=	--with-module=gdbm
.  include "../../databases/gdbm/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mbdb)
# it requires version 4, not anything older
CONFIGURE_ARGS+=	--with-module=berkeley-db
.  include "../../databases/db4/buildlink3.mk"
CPPFLAGS+=	-I${PREFIX}/include/db4
LDFLAGS+=	-L${PREFIX}/lib
.endif

.if !empty(PKG_OPTIONS:Mpcre)
CONFIGURE_ARGS+=	--with-module=pcre
.  include "../../devel/pcre/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mrawsock)
CONFIGURE_ARGS+=	--with-module=rawsock
.endif

.if !empty(PKG_OPTIONS:Mpari)
CONFIGURE_ARGS+=	--with-module=pari
.  include "../../math/pari/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mfastcgi)
CONFIGURE_ARGS+=	--with-module=fastcgi
.  include "../../www/fcgi/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mnew-clx)
CONFIGURE_ARGS+=	--with-module=clx/new-clx
.  include "../../x11/libX11/buildlink3.mk"
.  include "../../x11/libXau/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mmit-clx)
CONFIGURE_ARGS+=	--with-module=clx/mit-clx
.  include "../../x11/libX11/buildlink3.mk"
.  include "../../x11/libXau/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mgtk2)
CONFIGURE_ARGS+=	--with-module=gtk2
.  include "../../devel/libglade/buildlink3.mk"
.  include "../../x11/gtk2/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mwildcard)
CONFIGURE_ARGS+=	--with-module=wildcard
.endif

.if !empty(PKG_OPTIONS:Mzlib)
CONFIGURE_ARGS+=	--with-module=zlib
BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2
.include "../../devel/zlib/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mreadline)
USE_GNU_READLINE=	YES
CONFIGURE_ARGS+=	--with-readline
.include "../../devel/readline/buildlink3.mk"
.endif
cvs diff -r1.15 -r1.16 pkgsrc/lang/clisp/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/clisp/patches/patch-aa 2007/06/09 06:10:31 1.15
+++ pkgsrc/lang/clisp/patches/patch-aa 2008/02/29 19:34:44 1.16
@@ -1,26 +1,23 @@ @@ -1,26 +1,23 @@
1$NetBSD: patch-aa,v 1.15 2007/06/09 06:10:31 obache Exp $ 1$NetBSD: patch-aa,v 1.16 2008/02/29 19:34:44 tnn Exp $
2 2
3--- src/makemake.in.orig 2006-10-01 17:54:24.000000000 +0000 3Don't use cache file to avoid trailing space problem.
 4
 5--- src/makemake.in.orig 2008-01-03 20:28:49.000000000 +0100
4+++ src/makemake.in 6+++ src/makemake.in
5@@ -841,10 +841,10 @@ else 7@@ -1881,6 +1881,7 @@ echol "psdir = ${PSDIR}"
6 fi 8 echol "pdfdir = ${PDFDIR}"
7 if [ $HOS = unix ] ; then 9 echol "libdir = ${LIBDIR}"
8 test -n "$mandir" || 10 echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)"
9- mandir='${datadir}/man' # with autoconf-2.60: mandir='@mandir@' # usually '${datadir}/man' 11+echol "lisplibdir = \$(libdir)${NEXT_}clisp"
10+ mandir='${prefix}/man' # with autoconf-2.60: mandir='@mandir@' # usually '${datadir}/man' 12 if [ -n "$USE_GETTEXT" ] ; then
11 MANDIR=`echo "$mandir" | sed -e "$brace_to_paren"` 13 echol "localedir = ${LOCALEDIR}"
12 else 
13- mandir="\$(datadir)${NEXT_}man" 
14+ mandir="\$(prefix)${NEXT_}man" 
15 MANDIR="$mandir" 
16 fi 14 fi
17 if [ $HOS = unix ] ; then 15@@ -3342,7 +3343,7 @@ echotab " if test \"\$\${ac_cv_env_
18@@ -1361,7 +1361,7 @@ if [ "${with_dynamic_modules}" != no ];  16 echotab " if test \"\$\${ac_cv_env_CFLAGS_set}\" = set; then CFLAGS=\"\$\${ac_cv_env_CFLAGS_value}\"; export CFLAGS; fi; \\"
19 freebsd2* | netbsd* | openbsd*) 17 # we must use $(SHELL) for sub-configures because when the top CONFIG_SHELL
20 XCC_CREATESHARED='ld -Bshareable -o $lib $libs' 18 # is bash, config.cache may be unparsable with sh on Solaris
21 ;; 19-echotab " \$(SHELL) ./configure --cache-file=\$\${cache} --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\"
22- freebsd3* | gnu* | linux* | cygwin* | k*bsd*) 20+echotab " \$(SHELL) ./configure --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS);\\"
23+ freebsd3* | gnu* | linux* | cygwin* | k*bsd* | dragonfly*) 21 echotab " else \$(SHELL) ./configure --srcdir=\$\$m \$(MODULE_CONFIGURE_FLAGS); \\"
24 XCC_CREATESHARED='$CC $CFLAGS $CLFLAGS -shared -o $lib $libs' 22 echotab " fi ) ;\\"
25 ;; 23 echotab "fi"
26 hpux9* | hpux10*) 
cvs diff -r1.12 -r1.13 pkgsrc/lang/clisp/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/clisp/patches/patch-ab 2007/04/01 12:45:39 1.12
+++ pkgsrc/lang/clisp/patches/patch-ab 2008/02/29 19:34:44 1.13
@@ -1,15 +1,22 @@ @@ -1,15 +1,22 @@
1$NetBSD: patch-ab,v 1.12 2007/04/01 12:45:39 tron Exp $ 1$NetBSD: patch-ab,v 1.13 2008/02/29 19:34:44 tnn Exp $
2 2
3--- libcharset/Makefile.in.orig 2005-03-23 21:27:45.000000000 +0200 3--- src/po/Makefile.in.in.orig 2007-10-28 01:52:28.000000000 +0200
4+++ libcharset/Makefile.in 4+++ src/po/Makefile.in.in
5@@ -45,8 +45,8 @@ include/localcharset.h : 5@@ -80,7 +80,7 @@ install-data-yes: all force
6 install-lib : all force 6 @catalogs='$(CATALOGS)'; \
7 cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' 7 for cat in $$catalogs; do \
8 $(mkinstalldirs) $(includedir) 8 cat=`basename $$cat`; \
9- $(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h 9- destdir=$(localedir); \
10- $(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h 10+ destdir=$(DESTDIR)$(localedir); \
11+ $(TOOLS_PLATFORM.install) -c -m 644 include/libcharset.h $(includedir)/libcharset.h 11 lang=`echo $$cat | sed 's/\.gmo$$//'`; \
12+ $(TOOLS_PLATFORM.install) -c -m 644 include/localcharset.h $(includedir)/localcharset.h 12 dir="$$destdir/$$lang/LC_MESSAGES"; \
13  13 datarootdir=`echo "$$destdir" | sed -e 's,/[^/]*$$,,'`; \
14 install : include/libcharset.h include/localcharset.h force 14@@ -108,7 +108,7 @@ installdirs: force
15 cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' 15 @catalogs='$(CATALOGS)'; \
 16 for cat in $$catalogs; do \
 17 cat=`basename $$cat`; \
 18- destdir=$(localedir); \
 19+ destdir=$(DESTDIR)$(localedir); \
 20 lang=`echo $$cat | sed 's/\.gmo$$//'`; \
 21 dir="$$destdir/$$lang/LC_MESSAGES"; \
 22 datarootdir=`echo "$$destdir" | sed -e 's,/[^/]*,,'`; \
File Deleted: pkgsrc/lang/clisp/patches/patch-ac
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-ad
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-ae
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-af
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-ag
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-ah
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-ai
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-aj
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-ak
File Deleted: pkgsrc/lang/clisp/patches/Attic/patch-al