5 files changed, 38 insertions, 33 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index c5c6217713f7..744b535d74f3 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	0.9.11
+PORTVERSION=	0.9.12
 CATEGORIES=	lang lisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sbcl
@@ -28,7 +28,7 @@ LISP_CMD=	""
 BUILD_DEPENDS=	lisp:${PORTSDIR}/lang/cmucl
 LISP_CMD=	"lisp -noinit -batch"
 .else
-BOOT_VERSION=	0.9.9
+BOOT_VERSION=	0.9.11
 .endif
 
 USE_BZIP2=	yes
@@ -45,14 +45,6 @@ INFODIR=	${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502124
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contrib_asdf-install_installer.lisp
-.endif
-
-.if ${OSVERSION} >= 600022
-RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-.endif
-
 .if defined(BOOT_VERSION)
 BOOT_ARCH=	${ARCH:S/i386/x86/}
 BOOT_OS=	${OPSYS:L}
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 26c874bd009b..a1a370ea618b 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,9 +1,9 @@
-MD5 (sbcl-0.9.11-source.tar.bz2) = b82c3b7cf5c351cbe97af5150c17ad27
-SHA256 (sbcl-0.9.11-source.tar.bz2) = fb69460d5e466e97c9c3787b97130728731a71c2feb46eccb4fae6d5dfd20e4c
-SIZE (sbcl-0.9.11-source.tar.bz2) = 2722766
-MD5 (sbcl-0.9.11-html.tar.bz2) = 80e208a8b46b6747c291f67a8da79f7a
-SHA256 (sbcl-0.9.11-html.tar.bz2) = f58d2ea41e90c394d825dc94118f960cad7dd33914047a6b06856b7973913189
-SIZE (sbcl-0.9.11-html.tar.bz2) = 123284
-MD5 (sbcl-0.9.9-x86-freebsd-binary.tar.bz2) = 864a882d553b62715079fce546189b4a
-SHA256 (sbcl-0.9.9-x86-freebsd-binary.tar.bz2) = 154ea8381cede582950dadd7c2e6182d9e598d401e5b76b14b46cdd6c165fc1b
-SIZE (sbcl-0.9.9-x86-freebsd-binary.tar.bz2) = 7276372
+MD5 (sbcl-0.9.12-source.tar.bz2) = 82eef4f47d6a72a36d4484bf503fc7db
+SHA256 (sbcl-0.9.12-source.tar.bz2) = 94edb67315ef10d0a38192a73cc17bfcc0d63a470abd98e7349ee345f4f412a4
+SIZE (sbcl-0.9.12-source.tar.bz2) = 2740205
+MD5 (sbcl-0.9.12-html.tar.bz2) = 7ed75e3cdd2c1a03a26f60052ca13bc8
+SHA256 (sbcl-0.9.12-html.tar.bz2) = 7b11698a1edbb5db8477ca5f02bff987e7e58edd7a9d2fec5d1202e2ac954e6c
+SIZE (sbcl-0.9.12-html.tar.bz2) = 123311
+MD5 (sbcl-0.9.11-x86-freebsd-binary.tar.bz2) = 61581be9c165e339057e10693b773deb
+SHA256 (sbcl-0.9.11-x86-freebsd-binary.tar.bz2) = 38fe44021344726049e7356502cf9e2545bd2e48902b687c817ade70eafb74c1
+SIZE (sbcl-0.9.11-x86-freebsd-binary.tar.bz2) = 7470214
diff --git a/lang/sbcl/files/extra-patch-contrib_asdf-install_installer.lisp b/lang/sbcl/files/extra-patch-contrib_asdf-install_installer.lisp
deleted file mode 100644
index 17d69959305f..000000000000
--- a/lang/sbcl/files/extra-patch-contrib_asdf-install_installer.lisp
+++ /dev/null
@@ -1,14 +0,0 @@
---- contrib/asdf-install/installer.lisp.orig	Thu Jul 14 11:30:06 2005
-+++ contrib/asdf-install/installer.lisp	Fri Oct  7 00:22:49 2005
-@@ -249,8 +249,9 @@
-   (let* ((tar
-           (with-output-to-string (o)
-             (or
--             (sb-ext:run-program #-darwin "tar"
--                                 #+darwin "gnutar"
-+             (sb-ext:run-program #+darwin "gnutar"
-+ 				 #+freebsd "gtar"
-+				 #-(or darwin freebsd) "tar"
-                                  (list "-C" (namestring source)
-                                        "-xzvf" (namestring packagename))
-                                  :output o
diff --git a/lang/sbcl/files/patch-contrib_asdf-install_installer.lisp b/lang/sbcl/files/patch-contrib_asdf-install_installer.lisp
new file mode 100644
index 000000000000..3a7c93b0e281
--- /dev/null
+++ b/lang/sbcl/files/patch-contrib_asdf-install_installer.lisp
@@ -0,0 +1,24 @@
+Index: contrib/asdf-install/installer.lisp
+===================================================================
+RCS file: /cvsroot/sbcl/sbcl/contrib/asdf-install/installer.lisp,v
+retrieving revision 1.15
+diff -u -r1.15 installer.lisp
+--- contrib/asdf-install/installer.lisp	12 Jan 2006 13:26:41 -0000	1.15
++++ contrib/asdf-install/installer.lisp	16 Apr 2006 23:07:05 -0000
+@@ -264,11 +264,15 @@
+                                  :wait t)
+              (error "can't untar"))))
+          (dummy (princ tar))
++         (pos-start (if (and (>= (length tar) 2)
++                             (string= (subseq tar 0 2) "x "))
++                        2               ; bsdtar
++                        0))             ; GNU tar
+          (pos-slash (position #\/ tar))
+          (*default-pathname-defaults*
+           (merge-pathnames
+            (make-pathname :directory
+-                          `(:relative ,(subseq tar 0 pos-slash)))
++                          `(:relative ,(subseq tar pos-start pos-slash)))
+            source)))
+     (declare (ignore dummy))
+     (loop for asd in (directory
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index 8ea0b7a329d5..a512bf9ed210 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -189,6 +189,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dbsd_002dsockets_003asocket_002dopen_002dp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dbsd_002dsockets_003asocket_002dpeername.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dbsd_002dsockets_003asocket_002dreceive.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dbsd_002dsockets_003asocket_002dsend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dgray_003astream_002dadvance_002dto_002dcolumn.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dgray_003astream_002dclear_002dinput.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Generic_002dFunction-sb_002dgray_003astream_002dclear_002doutput.html
@@ -405,6 +406,8 @@ lib/sbcl/sb-bsd-sockets/split.lisp
 lib/sbcl/sb-bsd-sockets/test-passed
 lib/sbcl/sb-bsd-sockets/tests.fasl
 lib/sbcl/sb-bsd-sockets/tests.lisp
+lib/sbcl/sb-bsd-sockets/win32-constants.lisp
+lib/sbcl/sb-bsd-sockets/win32-sockets.lisp
 lib/sbcl/sb-cltl2/.cvsignore
 lib/sbcl/sb-cltl2/Makefile
 lib/sbcl/sb-cltl2/compiler-let.fasl