4 files changed, 22 insertions, 12 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index c6239866b3b5..d31dc60045b2 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clisp
-PORTVERSION=	2.27
+PORTVERSION=	2.28
 CATEGORIES=	lang
 MASTER_SITES=	ftp://cvs2.cons.org/pub/lisp/clisp/source/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,6 +17,13 @@ MAINTAINER=	jabrown@caida.org
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
+# In clisp-2.28, the build dies in the "regexp" module: the build target
+# invokes a configure script, which encounters a different CC variable than
+# the one the top-level configure cached.  We'll explicitly set CC to avoid
+# this.
+MAKE_ENV+= CC="${CC}"
+CONFIGURE_ENV+= CC="${CC}"
+
 # The build uses INSTALL_* to copy files around, but since the Ports
 # INSTALL_* try to set file permissions, using them breaks non-root builds.
 # Instead, we'll just fix up permissions in the post-install target, after we
@@ -27,7 +34,8 @@ CONFIGURE_ENV+=	INSTALL=${CP} INSTALL_DATA=${CP} INSTALL_PROGRAM=${CP} \
 # Build subdirectory
 BUILD_DIRNAME=${CONFIGURE_TARGET}
 
-# These came from clisp-2.27's "configure" on my 4.1.1-R system.
+# These came from clisp-2.28's "configure" on my 4.4-R system,
+# with "--with-module=regexp --with-export-syscalls" added in.
 MAKEMAKE_ARGS=--prefix=${PREFIX} --with-readline --with-gettext \
 	--with-dynamic-ffi --with-module=regexp --with-export-syscalls
 
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 366442041f78..3cebababd9b8 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1 +1 @@
-MD5 (clisp-2.27.tar.bz2) = d4939d1dbc1d4625dadc9e619d78eccc
+MD5 (clisp-2.28.tar.bz2) = 21d311ee262f4e0c54c35d65f16884e5
diff --git a/lang/clisp/files/patch-aa b/lang/clisp/files/patch-aa
index de3ccadb0a59..bcb97acb4290 100644
--- a/lang/clisp/files/patch-aa
+++ b/lang/clisp/files/patch-aa
@@ -1,17 +1,18 @@
---- src/makemake.in.orig	Mon Jun 25 07:54:46 2001
-+++ src/makemake.in	Sun Aug 26 23:41:48 2001
-@@ -1634,7 +1634,14 @@
- echol "mandir = \$(exec_prefix)${NEXT_}man"
+--- src/makemake.in.orig	Sun Mar  3 18:21:26 2002
++++ src/makemake.in	Mon Jun 24 22:23:12 2002
+@@ -1663,7 +1663,15 @@
  echol "htmldir = \$(exec_prefix)${NEXT_}share${NEXT_}html"
- echol "dvidir = \$(exec_prefix)${NEXT_}share${NEXT_}dvi"
+ echol "dvidir  = \$(exec_prefix)${NEXT_}share${NEXT_}dvi"
+ echol "docdir  = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
 +fsstnd=freebsd
  case "$fsstnd" in
 +  freebsd)
++    echol "mandir  = \$(exec_prefix)${NEXT_}man"
 +    echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
 +    echol "lispdocdir = \$(docdir)${NEXT_}clisp"
 +    echol "htmldir = \$(lispdocdir)"
 +    echol "dvidir = \$(lispdocdir)"
 +    ;;
-   gnu_ext)
-     echol "docdir = \$(exec_prefix)${NEXT_}doc"
-     echol "lispdocdir = \$(docdir)${NEXT_}clisp"
+   suse)
+     echol "lispdocdir = \$(docdir)${NEXT_}packages${NEXT_}clisp"
+     ;;
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 53e6fe31fe2b..6faad03f002f 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -48,12 +48,13 @@ share/doc/clisp/doc/CLOS-guide.txt
 share/doc/clisp/doc/LISP-tutorial.txt
 share/doc/clisp/doc/clisp.1
 share/doc/clisp/doc/clisp.dvi
-share/doc/clisp/doc/clisp.gif
 share/doc/clisp/doc/clisp.html
+share/doc/clisp/doc/clisp.png
 share/doc/clisp/doc/clreadline.3
 share/doc/clisp/doc/clreadline.dvi
 share/doc/clisp/doc/clreadline.html
 share/doc/clisp/doc/editors.txt
+share/doc/clisp/doc/impnotes.css
 share/doc/clisp/doc/impnotes.html
 share/doc/clisp/doc/readline.dvi
 share/locale/de/LC_MESSAGES/clisp.mo