--- a/components/clisp/Makefile	Mon Oct 22 12:14:39 2012 -0700
+++ b/components/clisp/Makefile	Mon Oct 22 12:26:34 2012 -0700
@@ -26,18 +26,21 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		clisp
-COMPONENT_VERSION=	2.47
+COMPONENT_VERSION=	2.49
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://clisp.cons.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:565256a50caca44a969b7440c986b3203a0b9679babd0f1dbcbc61a4f4622edb
+    sha256:8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/clisp/release/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# To include correct locale header file in .../modules/regexp/gllib/regex.c
+CPPFLAGS += -I/usr/share/gettext/intl
+
 # Required to configure correctly.
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -52,6 +55,7 @@
 # clisp's configure script is not a GNU auto* tools generated configure script
 # and doesn't take --sbindir, so we need to override the default values.
 CONFIGURE_OPTIONS = CC="$(CC) -DNO_GENERATIONAL_GC"
+CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS))
@@ -60,6 +64,23 @@
 CONFIGURE_OPTIONS += --with-libsigsegv-prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --with-libreadline-prefix=$(CONFIGURE_PREFIX)
 
+# Prevent clisp.ps and clisp.pdf having different versions for SPARC
+# and x86 in the clisp package, because of embedded dates.
+TIME_CONSTANT = 1348000000
+COMPONENT_BUILD_ENV +=		$(CONSTANT_TIME)
+
+# Adjust the "/ID [ ... ]" line in clisp.pdf to set it to a fixed value
+# to prevent it having different versions for SPARC and x86 in the clisp
+# package.  This value is normally generated by ghostscript, and is
+# different on each machine. The fixed value that's been used comes from 
+# value generated when building clisp on the Userland SPARC build machine.
+COMPONENT_POST_INSTALL_ACTION = \
+	(cd $(PROTOUSRSHAREDOCDIR)/clisp/doc ; \
+	$(GSED) -i 's|^/ID.*|/ID [<DEA6B2ECA0DB714B6BEB6209A211AEF0><DEA6B2ECA0DB714B6BEB6209A211AEF0>]|' clisp.pdf)
+
+# One of the tests now needs the GNU tail command.
+COMPONENT_TEST_ENV +=  PATH="$(GNUBIN):$(PATH)"
+
 # common targets
 build:		$(BUILD_32)
 

--- a/components/clisp/clisp.p5m	Mon Oct 22 12:14:39 2012 -0700
+++ b/components/clisp/clisp.p5m	Mon Oct 22 12:26:34 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,10 +41,11 @@
 dir path=usr/lib
 dir path=usr/lib/clisp
 dir path=usr/lib/clisp/base
+dir path=usr/lib/clisp/build-aux
 dir path=usr/lib/clisp/data
-dir path=usr/lib/clisp/full
 dir path=usr/lib/clisp/linkkit
 dir path=usr/share
+dir path=usr/share/aclocal
 dir path=usr/share/doc
 dir path=usr/share/doc/clisp
 dir path=usr/share/doc/clisp/doc
@@ -73,42 +74,34 @@
 dir path=usr/share/vim/vimfiles/after/syntax
 
 file path=usr/bin/clisp
+file path=usr/bin/clisp-link
+file path=usr/lib/clisp/base/bogomips.o
 file path=usr/lib/clisp/base/calls.o
 file path=usr/lib/clisp/base/gettext.o
+file path=usr/lib/clisp/base/libgnu_cl.a
+file path=usr/lib/clisp/base/libgnu_rx.a
+file path=usr/lib/clisp/base/libgnu_sc.a
 file path=usr/lib/clisp/base/libnoreadline.a
 file path=usr/lib/clisp/base/lisp.a
 file path=usr/lib/clisp/base/lisp.run mode=0555
 file path=usr/lib/clisp/base/lispinit.mem
-file path=usr/lib/clisp/base/localcharset.o
 file path=usr/lib/clisp/base/makevars
 file path=usr/lib/clisp/base/modules.h
 file path=usr/lib/clisp/base/modules.o
-file path=usr/lib/clisp/base/regex.o
 file path=usr/lib/clisp/base/regexi.o
-file path=usr/lib/clisp/base/regexp.dvi
-file path=usr/lib/clisp/base/uniname.o
-file path=usr/lib/clisp/base/width.o
-file path=usr/lib/clisp/clisp-link
+file path=usr/lib/clisp/build-aux/arg-nonnull.h
+file path=usr/lib/clisp/build-aux/c++defs.h
+file path=usr/lib/clisp/build-aux/config.guess
+file path=usr/lib/clisp/build-aux/config.rpath
+file path=usr/lib/clisp/build-aux/config.sub
+file path=usr/lib/clisp/build-aux/depcomp
+file path=usr/lib/clisp/build-aux/warn-on-use.h
 file path=usr/lib/clisp/data/Symbol-Table.text
 file path=usr/lib/clisp/data/UnicodeDataFull.txt
-file path=usr/lib/clisp/full/calls.o
-file path=usr/lib/clisp/full/gettext.o
-file path=usr/lib/clisp/full/libnoreadline.a
-file path=usr/lib/clisp/full/lisp.a
-file path=usr/lib/clisp/full/lisp.run mode=0555
-file path=usr/lib/clisp/full/lispinit.mem
-file path=usr/lib/clisp/full/localcharset.o
-file path=usr/lib/clisp/full/makevars
-file path=usr/lib/clisp/full/modules.h
-file path=usr/lib/clisp/full/modules.o
-file path=usr/lib/clisp/full/regex.o
-file path=usr/lib/clisp/full/regexi.o
-file path=usr/lib/clisp/full/regexp.dvi
-file path=usr/lib/clisp/full/uniname.o
-file path=usr/lib/clisp/full/width.o
 file path=usr/lib/clisp/linkkit/clisp.h
 file path=usr/lib/clisp/linkkit/modprep.lisp
 file path=usr/lib/clisp/linkkit/modules.c
+file path=usr/share/aclocal/clisp.m4
 file path=usr/share/doc/clisp/ANNOUNCE
 file path=usr/share/doc/clisp/COPYRIGHT
 file path=usr/share/doc/clisp/GNU-GPL
@@ -118,14 +111,23 @@
 file path=usr/share/doc/clisp/README.de
 file path=usr/share/doc/clisp/README.es
 file path=usr/share/doc/clisp/SUMMARY
+file path=usr/share/doc/clisp/clisp-link.html
+file path=usr/share/doc/clisp/clisp-link.pdf
+file path=usr/share/doc/clisp/clisp-link.ps
+file path=usr/share/doc/clisp/clisp.html
+file path=usr/share/doc/clisp/clisp.pdf
+file path=usr/share/doc/clisp/clisp.ps
 file path=usr/share/doc/clisp/doc/CLOS-guide.txt
 file path=usr/share/doc/clisp/doc/LISP-tutorial.txt
-file path=usr/share/doc/clisp/doc/clisp.dvi
+file path=usr/share/doc/clisp/doc/clisp-link.1
+file path=usr/share/doc/clisp/doc/clisp-link.html
+file path=usr/share/doc/clisp/doc/clisp-link.pdf
+file path=usr/share/doc/clisp/doc/clisp-link.ps
+file path=usr/share/doc/clisp/doc/clisp.1
 file path=usr/share/doc/clisp/doc/clisp.html
 file path=usr/share/doc/clisp/doc/clisp.pdf
 file path=usr/share/doc/clisp/doc/clisp.png
 file path=usr/share/doc/clisp/doc/clisp.ps
-file path=usr/share/doc/clisp/doc/editors.txt
 file path=usr/share/doc/clisp/doc/impnotes.css
 file path=usr/share/doc/clisp/doc/impnotes.html
 file path=usr/share/emacs/site-lisp/clhs.el
@@ -147,5 +149,6 @@
 file path=usr/share/locale/nl/LC_MESSAGES/clisplow.mo
 file path=usr/share/locale/ru/LC_MESSAGES/clisp.mo
 file path=usr/share/locale/ru/LC_MESSAGES/clisplow.mo
+file path=usr/share/man/man1/clisp-link.1
 file path=usr/share/man/man1/clisp.1
 file path=usr/share/vim/vimfiles/after/syntax/lisp.vim

--- a/components/clisp/patches/makemake.in.patch	Mon Oct 22 12:14:39 2012 -0700
+++ b/components/clisp/patches/makemake.in.patch	Mon Oct 22 12:26:34 2012 -0700
@@ -1,6 +1,6 @@
---- src.orig/makemake.in	Fri Oct 24 06:27:58 2008
-+++ src/makemake.in	Mon Feb  2 15:48:08 2009
-@@ -1826,7 +1826,7 @@
+--- src/makemake.in.orig	2012-05-30 11:27:19.564691644 -0700
++++ src/makemake.in	2012-05-30 11:29:55.415062484 -0700
+@@ -1904,7 +1904,7 @@
  echol "#   make distrib VERSION_SUFFIX=pre"
  echol "VERSION_SUFFIX="
  echol "# The distribution's top directory"
@@ -9,14 +9,15 @@
  echol
  echol '# Directories used by "make install":'
  echol "prefix = ${PREFIX}"
-@@ -3379,8 +3379,8 @@
-   case $f in
-     clisp.html | clisp.1 | clisp-1.html)
-       if [ $HOS = win32 ];
--      then platform_line=" | sed -e \"s,@PLATFORM@,${TSYS},g\""
--      else platform_line=" | sed -e \"s,@PLATFORM@,${host},g\""
-+      then platform_line=" | sed -e \"s,Platform: @PLATFORM@,User Commands,g\""
-+      else platform_line=" | sed -e \"s,Platform: @PLATFORM@,User Commands,g\""
+@@ -3450,9 +3448,9 @@
+     clisp.html | clisp.1 | clisp-1.html | \
+     clisp-link.html | clisp-link.1 | clisp-link-1.html )
+       if [ $HOS = win32 ]; then
+-        platform_line=" | sed -e \"s,@PLATFORM@,${TSYS},g\""
++        platform_line=" | sed -e \"s,Platform: @PLATFORM@,User Commands,g\""
+       else
+-        platform_line=" | sed -e \"s,@PLATFORM@,${host},g\""
++        platform_line=" | sed -e \"s,Platform: @PLATFORM@,User Commands,g\""
        fi
        sourcedir=${SRCDOCDIR} ;;
      *) sourcedir=${SRCDIR} ;;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/clisp/patches/stream.d.patch	Mon Oct 22 12:26:34 2012 -0700
@@ -0,0 +1,11 @@
+--- src/stream.d.orig	2012-09-05 05:50:05.863643076 -0700
++++ src/stream.d	2012-09-05 07:32:38.494710125 -0700
+@@ -3483,6 +3483,8 @@
+   #define IS_EINVAL_EXTRA  ((errno==EBADF)||(errno==EACCES)||(errno==EBADRQC))
+ #elif defined(UNIX_DARWIN) || defined(UNIX_FREEBSD) || defined(UNIX_NETBSD) || defined(UNIX_OPENBSD)
+   #define IS_EINVAL_EXTRA  ((errno==EOPNOTSUPP)||(errno==ENOTSUP)||(errno==ENODEV))
++#elif defined(UNIX_SUNOS5)
++  #define IS_EINVAL_EXTRA  ((errno==ENXIO))
+ #else
+   #define IS_EINVAL_EXTRA  0
+ #endif

--- a/tools/time.c	Mon Oct 22 12:14:39 2012 -0700
+++ b/tools/time.c	Mon Oct 22 12:26:34 2012 -0700
@@ -36,9 +36,11 @@
 #include <time.h>
 
 /* The list of programs that we want to use a constant time. */
-static char *programs[] = { "autogen", "bash", "cpp", "cc1", "date", "doxygen",
-	"erl", "javadoc", "ksh", "ksh93", "ld", "perl", "perl5.8.4", "perl5.10",
-	"ruby", "sh", NULL };
+static char *programs[] = { 
+	"autogen", "bash", "cpp", "cc1", "date", "doxygen",
+	"erl", "grops", "gs", "gtroff", "javadoc", "ksh", "ksh93", "ld",
+	"perl", "perl5.8.4", "perl5.10", "ruby", "sh", NULL
+};
 
 static int
 stack_info(uintptr_t pc, int signo, void *arg)

--- a/transforms/docs	Mon Oct 22 12:14:39 2012 -0700
+++ b/transforms/docs	Mon Oct 22 12:26:34 2012 -0700
@@ -44,6 +44,10 @@
 <transform dir file link hardlink path=usr/.*/doc/.*\.pdf$ -> \
     default facet.doc.pdf true>
 
+# ps docs
+<transform dir file link hardlink path=usr/.*/doc/.*\.ps$ -> \
+    default facet.doc.ps true>
+
 # general documentation
 <transform dir file link hardlink path=usr/.*/doc(/.+){0,1}$ -> \
     default facet.doc true>