4 files changed, 36 insertions, 14 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index ab08d21db491..a2ae15b96074 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clisp
-PORTVERSION=	2.43
+PORTVERSION=	2.44
 CATEGORIES=	lang lisp
 MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION} \
 		ftp://sunsite.unc.edu/pub/Linux/devel/lang/lisp/
@@ -14,10 +14,10 @@ MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION} \
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A Common Lisp implementation
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libsigsegv.a:${PORTSDIR}/devel/libsigsegv
+BUILD_DEPENDS=	${LOCALBASE}/lib/libsigsegv.a:${PORTSDIR}/devel/libsigsegv \
+		${LOCALBASE}/lib/libavcall.a:${PORTSDIR}/devel/ffcall
 LIB_DEPENDS=	readline.5:${PORTSDIR}/devel/readline
 
-USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GHOSTSCRIPT_BUILD=	yes
@@ -55,11 +55,13 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-# Semgentation fault in amd64 when using 'mmap(2)'. Also in Linux/ia64.
+# Semgentation fault in amd64 when using 'mmap(2)', errno = EINVAL.
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=--disable-mmap
-.elif ${OSVERSION} >= 800000
-BROKEN=	dumps core during build
+.endif
+
+.if ${ARCH} == "i386" && ${OSVERSION} >= 700000
+USE_GCC=	3.4
 .endif
 
 MODULES=	BDB CLX_MIT CLX_NEW FASTCGI GDBM GTK2 ORACLE PARI PCRE PGSQL \
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 92928defde2c..c3af23b15efd 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,3 +1,3 @@
-MD5 (clisp-2.43.tar.bz2) = 45cf7ab628cab83e99ceaa75aa880b63
-SHA256 (clisp-2.43.tar.bz2) = b5213ccc59d65c190f47c0e4f04d568a1a66bcb28ae5ed59705e59c6b8b11e83
-SIZE (clisp-2.43.tar.bz2) = 8143871
+MD5 (clisp-2.44.tar.gz) = 3496535f1eebe8b9c8962a18305fdeed
+SHA256 (clisp-2.44.tar.gz) = a05535fa4e89fa205b3e69045ea545e14f48537e2dc96acab5af52f2f7cd1da9
+SIZE (clisp-2.44.tar.gz) = 8880472
diff --git a/lang/clisp/files/patch-configure b/lang/clisp/files/patch-configure
new file mode 100644
index 000000000000..3031d2869f26
--- /dev/null
+++ b/lang/clisp/files/patch-configure
@@ -0,0 +1,25 @@
+--- ./configure.orig	Wed Dec 12 20:56:58 2007
++++ ./configure	Mon Feb  4 14:53:22 2008
+@@ -380,22 +380,18 @@
+         passnextm=yes ;;
+ 
+       --elispdir=* | --elispdi=* | --elispd=* | --elisp=* | --elis=* | --eli=* | --el=*)
+-        subdir_configure_args="$subdir_configure_args $arg"
+         makemake_args="$makemake_args --elispdir="`getarg "$arg"` ;;
+ 
+       --elispdir | --elispdi | --elispd | --elisp | --elis | --eli | --el)
+-        subdir_configure_args="$subdir_configure_args $arg"
+         makemake_args="$makemake_args --elispdir="
+         prev=elispdir
+         passnext=yes
+         passnextm=yes ;;
+ 
+       --vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
+-        subdir_configure_args="$subdir_configure_args $arg"
+         makemake_args="$makemake_args --vimdir="`getarg "$arg"` ;;
+ 
+       --vimdir | --vimdi | --vimd | --vim | --vi)
+-        subdir_configure_args="$subdir_configure_args $arg"
+         makemake_args="$makemake_args --vimdir="
+         prev=vimdir
+         passnext=yes
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 340b8e6571e8..383681ad165e 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -1,8 +1,6 @@
 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/libnoreadline.a
 lib/clisp/base/lisp.a
 lib/clisp/base/lisp.run
@@ -59,8 +57,6 @@ lib/clisp/full/gettext.o
 %%CLX_MIT%%lib/clisp/full/input.lisp
 %%CLX_MIT%%lib/clisp/full/keysyms.fas
 %%CLX_MIT%%lib/clisp/full/keysyms.lisp
-lib/clisp/full/libavcall.a
-lib/clisp/full/libcallback.a
 lib/clisp/full/libnoreadline.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
@@ -105,7 +101,6 @@ lib/clisp/full/width.o
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
-lib/clisp/linkkit/modules.d
 %%DOCSDIR%%/ANNOUNCE
 %%DOCSDIR%%/COPYRIGHT
 %%DOCSDIR%%/GNU-GPL