- The distfile has been rerolled with the missing SUPPORT file included.

- Fix FILL bug on amd64 platforms.

5 files changed, 90 insertions, 17 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 6f382ec5851..249ea7607d4 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -9,13 +9,13 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.29
+PORTVERSION=	1.0.29.2
 PORTREVISION=	0
 CATEGORIES=	lang lisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
 MASTER_SITE_SUBDIR=	sbcl
-DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-source${SBCLPATCHLEVEL}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A Common Lisp development system derived from the CMU CL system
@@ -37,6 +37,14 @@ INFODIR=	${PREFIX}/${INFO_PATH}
 
 OSVER_MAJOR=	${OSVERSION:C/([0-9]).*/\1/}
 
+.if ${PORTVERSION:E} == 0
+SBCLPATCHLEVEL=	#empty
+.else
+SBCLPATCHLEVEL=	-r${PORTVERSION:E}
+.endif
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 # Empty dirs in distribution to keep
 EMPTY_DIRS=	sb-bsd-sockets/alien sb-posix/alien sb-posix/test-lab \
 		site-systems
@@ -70,7 +78,7 @@ LISP_EXTRA_ARG=	--dynamic-space-size ${DYNAMIC_SPACE_SIZE}
 
 . for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
 BOOT_DISTNAME=	${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH_OS}
-DISTFILES:=	${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries
+DISTFILES:=	${DISTNAME}${EXTRACT_SUFX} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries
 . endfor
 LISP_CMD=	"${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core ${LISP_EXTRA_ARG} --disable-debugger --userinit /dev/null --sysinit /dev/null"
 
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index d928ed9132b..cd525f768d6 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,6 +1,6 @@
-MD5 (sbcl-1.0.29-source.tar.bz2) = 57c9430dc0c0d514bd9fa201fcc2c5ed
-SHA256 (sbcl-1.0.29-source.tar.bz2) = 0ef79cba06e2d82f16e1a367545ac8bbd51ecccc1a879309b71cf818a00a8010
-SIZE (sbcl-1.0.29-source.tar.bz2) = 3276399
+MD5 (sbcl-1.0.29-source-r2.tar.bz2) = 0dd65614533972500bbcd341de17182d
+SHA256 (sbcl-1.0.29-source-r2.tar.bz2) = ce2d01e91e84d3170ca030046d6a5324ad3411c90fabbde3078cb58e759c4f2a
+SIZE (sbcl-1.0.29-source-r2.tar.bz2) = 3275747
 MD5 (sbcl-1.0.17-amd64-freebsd8-binary.tar.bz2) = 97c0acdaab6a0ad0101cf6d23e03176f
 SHA256 (sbcl-1.0.17-amd64-freebsd8-binary.tar.bz2) = 19f7a1311e2b0c7a174cce2182c9a240f0b1fe12eeb61de6e1cc253d47c4dc27
 SIZE (sbcl-1.0.17-amd64-freebsd8-binary.tar.bz2) = 7786927
diff --git a/lang/sbcl/files/patch-install.sh b/lang/sbcl/files/patch-install.sh
deleted file mode 100644
index e4eeabb56a2..00000000000
--- a/lang/sbcl/files/patch-install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- install.sh.orig	2009-06-04 18:51:44.000000000 +0400
-+++ install.sh	2009-06-04 18:51:48.000000000 +0400
-@@ -138,7 +138,7 @@
-       && echo " html $BUILD_ROOT$DOC_DIR/html/`basename $html`/index.html"
- done
- 
--for f in BUGS SUPPORT CREDITS COPYING NEWS
-+for f in BUGS CREDITS COPYING NEWS
- do
-   cp $f "$BUILD_ROOT$DOC_DIR"/
- done
diff --git a/lang/sbcl/files/patch-src_compiler_seqtran.lisp b/lang/sbcl/files/patch-src_compiler_seqtran.lisp
new file mode 100644
index 00000000000..1dda7f686f5
--- /dev/null
+++ b/lang/sbcl/files/patch-src_compiler_seqtran.lisp
@@ -0,0 +1,75 @@
+--- src/compiler/seqtran.lisp	2009/05/18 07:58:11	1.103
++++ src/compiler/seqtran.lisp	2009/06/04 18:01:32	1.104
+@@ -569,40 +569,44 @@
+                                         #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+                                         (:complex-single-float
+                                          (logior (ash (single-float-bits (imagpart tmp)) 32)
+-                                                 (single-float-bits (realpart tmp)))))))
++                                                 (ldb (byte 32 0)
++                                                      (single-float-bits (realpart tmp))))))))
+                                 (res bits))
+                            (loop for i of-type sb!vm:word from n-bits by n-bits
+                                  until (= i sb!vm:n-word-bits)
+                                  do (setf res (ldb (byte sb!vm:n-word-bits 0)
+                                                    (logior res (ash bits i)))))
+                            res))
+-                       `(let* ((bits (ldb (byte ,n-bits 0)
+-                                          ,(ecase kind
+-                                                  (:tagged
+-                                                   `(ash item ,sb!vm:n-fixnum-tag-bits))
+-                                                  (:char
+-                                                   `(char-code item))
+-                                                  (:bits
+-                                                   `item)
+-                                                  (:single-float
+-                                                   `(single-float-bits item))
+-                                                  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+-                                                  (:double-float
+-                                                   `(logior (ash (double-float-high-bits item) 32)
+-                                                            (double-float-low-bits item)))
+-                                                  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+-                                                  (:complex-single-float
+-                                                   `(logior (ash (single-float-bits (imagpart item)) 32)
+-                                                            (single-float-bits (realpart item)))))))
+-                               (res bits))
+-                          (declare (type sb!vm:word res))
+-                          ,@(unless (= sb!vm:n-word-bits n-bits)
+-                                    `((loop for i of-type sb!vm:word from ,n-bits by ,n-bits
+-                                            until (= i sb!vm:n-word-bits)
+-                                            do (setf res
+-                                                     (ldb (byte ,sb!vm:n-word-bits 0)
+-                                                          (logior res (ash bits (truly-the (integer 0 ,(- sb!vm:n-word-bits n-bits)) i))))))))
+-                          res))))
++                       (progn
++                         (delay-ir1-transform node :constraint)
++                        `(let* ((bits (ldb (byte ,n-bits 0)
++                                           ,(ecase kind
++                                                   (:tagged
++                                                    `(ash item ,sb!vm:n-fixnum-tag-bits))
++                                                   (:char
++                                                    `(char-code item))
++                                                   (:bits
++                                                    `item)
++                                                   (:single-float
++                                                    `(single-float-bits item))
++                                                   #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
++                                                   (:double-float
++                                                    `(logior (ash (double-float-high-bits item) 32)
++                                                             (double-float-low-bits item)))
++                                                   #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
++                                                   (:complex-single-float
++                                                    `(logior (ash (single-float-bits (imagpart item)) 32)
++                                                             (ldb (byte 32 0)
++                                                                  (single-float-bits (realpart item))))))))
++                                (res bits))
++                           (declare (type sb!vm:word res))
++                           ,@(unless (= sb!vm:n-word-bits n-bits)
++                                     `((loop for i of-type sb!vm:word from ,n-bits by ,n-bits
++                                             until (= i sb!vm:n-word-bits)
++                                             do (setf res
++                                                      (ldb (byte ,sb!vm:n-word-bits 0)
++                                                           (logior res (ash bits (truly-the (integer 0 ,(- sb!vm:n-word-bits n-bits)) i))))))))
++                           res)))))
+              (values
+               `(with-array-data ((data seq)
+                                  (start start)
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index e1d64b290c9..44cfca6f6c6 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/CREDITS
 %%DOCSDIR%%/NEWS
+%%DOCSDIR%%/SUPPORT
 bin/sbcl
 lib/sbcl/asdf-install/.cvsignore
 lib/sbcl/asdf-install/Makefile