summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/clisp/Makefile51
-rw-r--r--lang/clisp/PLIST16
-rw-r--r--lang/clisp/distinfo12
-rw-r--r--lang/clisp/patches/patch-aa29
-rw-r--r--lang/clisp/patches/patch-ab12
-rw-r--r--lang/clisp/patches/patch-ai48
6 files changed, 59 insertions, 109 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index cf82743e431..0e7b3c406bd 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,49 +1,48 @@
-# $NetBSD: Makefile,v 1.47 2006/03/04 21:29:53 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/03/11 23:32:44 wiz Exp $
-DISTNAME= clisp-2.33.2
-PKGREVISION= 1
-CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/}
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= clisp-2.38
+CATEGORIES= lang
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://clisp.cons.org/
-COMMENT= CLISP, a Common Lisp implementation
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://clisp.cons.org/
+COMMENT= CLISP, a Common Lisp implementation
-NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64 # severe LP64 problems
+# XXX: uncomment if still true (commented out during update to 2.38)
+#NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64 # severe LP64 problems
-PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_PKGLOCALEDIR= YES
-CONFIGURE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} CPPFLAGS=${CPPFLAGS:M*:Q} \
- gt_cv_func_gnugettext2_libintl=yes
+BUILD_DIRS= src
+CONFIGURE_DIRS= . modules/i18n modules/syscalls modules/pcre modules/readline modules/regexp modules/wildcard
+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=syscalls --with-module=regexp
MODULES+= --with-module=pcre --with-module=wildcard
+CONFIGURE_ARGS+= ${MODULES}
+TEST_TARGET= check
post-patch:
- ${CP} files/tramp-rs6000-netbsd.o ${WRKSRC}/../ffcall/callback/trampoline_r
- ${CP} files/tramp-rs6000-netbsd.s ${WRKSRC}/../ffcall/callback/trampoline_r
- ${CP} files/vacall-rs6000-netbsd.s ${WRKSRC}/../ffcall/callback/vacall_r
-
-do-configure:
- cd ${WRKSRC} && \
- (cd .. ; ${SETENV} ${CONFIGURE_ENV} \
- ${CONFIGURE_SCRIPT} --host=${MACHINE_GNU_PLATFORM} \
- --prefix=${PREFIX} ${MODULES}) && \
+ ${CP} files/tramp-rs6000-netbsd.o ${WRKSRC}/ffcall/callback/trampoline_r
+ ${CP} files/tramp-rs6000-netbsd.s ${WRKSRC}/ffcall/callback/trampoline_r
+ ${CP} files/vacall-rs6000-netbsd.s ${WRKSRC}/ffcall/callback/vacall_r
+
+post-configure:
+ cd ${WRKSRC}/src && \
./makemake --prefix=${PREFIX} --with-readline --with-gettext \
--with-dynamic-ffi --fsstnd=netbsd ${MODULES} >Makefile
pre-build:
- cd ${WRKSRC}/avcall && ${MAKE}
- cd ${WRKSRC}/callback && ${MAKE}
+ cd ${WRKSRC}/src/avcall && ${MAKE}
+ cd ${WRKSRC}/src/callback && ${MAKE}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libsigsegv/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST
index 2dda444d604..00a7e0fbb74 100644
--- a/lang/clisp/PLIST
+++ b/lang/clisp/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2005/08/03 20:46:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/11 23:32:44 wiz 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
@@ -10,11 +12,16 @@ lib/clisp/base/lispinit.mem
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/clisp-link
+lib/clisp/data/Symbol-Table.text
lib/clisp/data/UnicodeDataFull.txt
-lib/clisp/data/clhs.txt
lib/clisp/full/calls.o
lib/clisp/full/cpcre.o
+lib/clisp/full/gettext.o
lib/clisp/full/libavcall.a
lib/clisp/full/libcallback.a
lib/clisp/full/libcharset.a
@@ -25,12 +32,13 @@ lib/clisp/full/lispinit.mem
lib/clisp/full/makevars
lib/clisp/full/modules.h
lib/clisp/full/modules.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/linkkit/clisp.h
-lib/clisp/linkkit/exporting.lisp
lib/clisp/linkkit/modprep.lisp
lib/clisp/linkkit/modules.c
lib/clisp/linkkit/modules.d
@@ -54,6 +62,8 @@ share/doc/clisp/clisp.ps
share/doc/clisp/editors.txt
share/doc/clisp/impnotes.css
share/doc/clisp/impnotes.html
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/clisp.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/clisplow.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/clisp.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/clisplow.mo
${PKGLOCALEDIR}/locale/en/LC_MESSAGES/clisp.mo
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 114038d0fc7..be721bd86dd 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2005/12/30 12:39:43 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/03/11 23:32:44 wiz Exp $
-SHA1 (clisp-2.33.2.tar.bz2) = b2403257f244a1502d63280a262629795821edae
-RMD160 (clisp-2.33.2.tar.bz2) = 2ecbd8f215e1485c63f80776ee37a02b770f98c7
-Size (clisp-2.33.2.tar.bz2) = 6091273 bytes
-SHA1 (patch-aa) = e7ef5ce48e6215d803d03ea57b23a80fb0862794
-SHA1 (patch-ab) = 3211f0d859fae536d11f7b7cd677ed5e83dc5f8a
-SHA1 (patch-ai) = 1890cdfb1f59ca573a802e889f2bb2dbc8e32256
+SHA1 (clisp-2.38.tar.bz2) = d9586c04ed4778b5c603b3b1df73e8c76220df59
+RMD160 (clisp-2.38.tar.bz2) = 9070e1d7cd4db66de62f077b68a7fef7413da622
+Size (clisp-2.38.tar.bz2) = 8078151 bytes
+SHA1 (patch-aa) = b22797602a3cbd43fb56ad4a2a54f69d67979929
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index 5f62e1c3fa8..094b9bfc2b4 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.11 2004/03/29 02:46:18 perry Exp $
+$NetBSD: patch-aa,v 1.12 2006/03/11 23:32:44 wiz Exp $
---- ../configure.orig 2004-03-28 16:37:55.000000000 -0500
-+++ ../configure 2004-03-28 16:39:05.000000000 -0500
-@@ -7,6 +7,9 @@
- # configure make.gcc gcc (deprecated)
- # configure make.cc cc (deprecated)
-
-+# strip leading spaces, which lead to problems later on
-+CPPFLAGS="`echo $CPPFLAGS`"
-+
- info_help () {
- cat << \EOP
- Usage: configure [options] [dirname]
+--- src/makemake.in.orig 2006-01-23 21:07:27.000000000 +0000
++++ src/makemake.in
+@@ -823,10 +823,10 @@ else
+ fi
+ if [ $HOS = unix ] ; then
+ test -n "$mandir" ||
+- mandir='${datadir}/man' # with autoconf-2.60: mandir='@mandir@' # usually '${datadir}/man'
++ mandir='${prefix}/man' # with autoconf-2.60: mandir='@mandir@' # usually '${datadir}/man'
+ MANDIR=`echo "$mandir" | sed -e "$brace_to_paren"`
+ else
+- mandir="\$(datadir)${NEXT_}man"
++ mandir="\$(prefix)${NEXT_}man"
+ MANDIR="$mandir"
+ fi
+ if [ $HOS = unix ] ; then
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
deleted file mode 100644
index cae80c8a90b..00000000000
--- a/lang/clisp/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/12/30 12:39:43 joerg Exp $
-
---- unix.d.orig 2005-12-30 12:22:01.000000000 +0000
-+++ unix.d
-@@ -25,7 +25,6 @@
-
- /* the table of the system error messages */
- #include <errno.h>
--extern int errno; /* last error code */
- /* NB: errno may be a macro which expands to a function call.
- Therefore access and assignment to errno must be wrapped in
- begin_system_call()/end_system_call() */
diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai
deleted file mode 100644
index b8bb636284c..00000000000
--- a/lang/clisp/patches/patch-ai
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/03/29 02:46:18 perry Exp $
-
---- makemake.in.orig 2004-03-16 17:04:05.000000000 -0500
-+++ makemake.in 2004-03-28 21:14:18.000000000 -0500
-@@ -348,6 +348,7 @@
- GROFF='@GROFF@' # either 'groff' or ''
- GMALLOC='@GMALLOC@' # either 'gmalloc' or ''
- LIBS='@LIBS@' # list of system libraries
-+ LDFLAGS='@LDFLAGS@' # additional options for linking
- LIBTERMCAP='@LIBTERMCAP@' # either '-ltermcap' or '-lncurses'
- LIBICONV='@LIBICONV@' # either '-liconv' or ''
- LIBSIGSEGV='@LTLIBSIGSEGV@' # '-lsigsegv -L/usr/local/lib' or ''
-@@ -1534,7 +1535,7 @@
- echol "exec_prefix = ${EXEC_PREFIX}"
- echol "bindir = \$(exec_prefix)${NEXT_}bin"
- echol "shared = \$(prefix)${NEXT_}share"
--echol "mandir = \$(shared)${NEXT_}man"
-+echol "mandir = \$(prefix)${NEXT_}man"
- echol "docdir = \$(shared)${NEXT_}doc"
- case "$fsstnd" in
- suse)
-@@ -1611,12 +1612,14 @@
- echol "CPP = ${XCPP}"
- echol "CLFLAGS = ${XCLFLAGS}"
- echol "LIBS = ${LIBS}"
-+ echol "LDFLAGS = ${LDFLAGS}"
- XCC="\$(CC)"
- XCPPFLAGS="\$(CPPFLAGS)"
- XCFLAGS="\$(CFLAGS)"
- XCPP="\$(CPP)"
- XCLFLAGS="\$(CLFLAGS)"
- LIBS="\$(LIBS)"
-+ LDFLAGS="\$(LDFLAGS)"
- fi
- echol "X_LIBS = ${X_LIBS}"
- X_LIBS="\$(X_LIBS)"
-@@ -2479,9 +2482,9 @@
- if [ $XCC_GCC = true -a -n "$SOLARIS_LINKING" ] ; then
- # Dynamically linking on Solaris 2.[23] is a pain.
- LIBGCC_DIR='`'"${XCC} -print-libgcc-file-name"' | sed -e '"'"'s,[^/]*$$,,'"'"'`'
-- echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc"
-+ echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc"
- else
-- echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}"
-+ echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}"
- fi
- if [ $HOS = unix ] ; then
- echotab "-sync"
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-15 23:14:04 +0000