Attachment #71153 for bug #103698

View | Details | Raw Unified | Return to bug 103698
Collapse All | Expand All

Lines 6-12 Link Here

(-)./Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= sbcl	8	PORTNAME= sbcl
9	PORTVERSION= 0.9.16	9	PORTVERSION= 0.9.17
10	CATEGORIES= lang lisp	10	CATEGORIES= lang lisp
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= sbcl	12	MASTER_SITE_SUBDIR= sbcl
Lines 28-34 Link Here
28	BUILD_DEPENDS= lisp:${PORTSDIR}/lang/cmucl	28	BUILD_DEPENDS= lisp:${PORTSDIR}/lang/cmucl
29	LISP_CMD= "lisp -noinit -batch"	29	LISP_CMD= "lisp -noinit -batch"
30	.else	30	.else
31	BOOT_VERSION= 0.9.11	31	BOOT_VERSION= 0.9.16
32	.endif	32	.endif
33		33
34	USE_BZIP2= yes	34	USE_BZIP2= yes

Lines 1-9 Link Here

(-)./distinfo (-9 / +9 lines)
1	MD5 (sbcl-0.9.16-source.tar.bz2) = 0117cc7af9ff701c8bf10c4ea048fdac	1	MD5 (sbcl-0.9.17-source.tar.bz2) = 1f2297931f35d6d84d632c30aa099c13
2	SHA256 (sbcl-0.9.16-source.tar.bz2) = 33baf9044638a5d36910212c3e6be1abb233a0404d3c3e1788cfee01742609a9	2	SHA256 (sbcl-0.9.17-source.tar.bz2) = 72eb9db7edc1dde2b7a14699320ad4358247cd6d6eed48ef4e6375e94f6dec77
3	SIZE (sbcl-0.9.16-source.tar.bz2) = 2766768	3	SIZE (sbcl-0.9.17-source.tar.bz2) = 2783569
4	MD5 (sbcl-0.9.16-html.tar.bz2) = b720f3ee213fcd98257566fccfe4a904	4	MD5 (sbcl-0.9.17-html.tar.bz2) = 5229d12ee158559f479fd17270218bdb
5	SHA256 (sbcl-0.9.16-html.tar.bz2) = 422201dcae6056f1923645a7249912a8ef0f4cf17910707597d521f08115a351	5	SHA256 (sbcl-0.9.17-html.tar.bz2) = c29cb49b8704d014cdad302c1be7f14f4002f45f1d6012322c3a99a0a300207b
6	SIZE (sbcl-0.9.16-html.tar.bz2) = 124240	6	SIZE (sbcl-0.9.17-html.tar.bz2) = 125066
7	MD5 (sbcl-0.9.11-x86-freebsd-binary.tar.bz2) = 61581be9c165e339057e10693b773deb	7	MD5 (sbcl-0.9.16-x86-freebsd-binary.tar.bz2) = 339df1c8d5aff512c1fa4362954443a5
8	SHA256 (sbcl-0.9.11-x86-freebsd-binary.tar.bz2) = 38fe44021344726049e7356502cf9e2545bd2e48902b687c817ade70eafb74c1	8	SHA256 (sbcl-0.9.16-x86-freebsd-binary.tar.bz2) = 61cd97c58615370606c9f01ca2049d71b9a05a3c84f2b299fe16ddba38e7e19c
9	SIZE (sbcl-0.9.11-x86-freebsd-binary.tar.bz2) = 7470214	9	SIZE (sbcl-0.9.16-x86-freebsd-binary.tar.bz2) = 7454913




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

Lines 229-234 Link Here

(-)./pkg-plist (+1 lines)
229	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Initialization-Files.html	229	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Initialization-Files.html
230	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Internals-Documentation.html	230	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Internals-Documentation.html
231	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Internet-Community.html	231	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Internet-Community.html
		232	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Interpreter.html
232	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Introduction-to-the-Foreign-Function-Interface.html	233	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Introduction-to-the-Foreign-Function-Interface.html
233	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Introduction.html	234	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Introduction.html
234	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Language-Reference.html	235	%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Language-Reference.html

Return to bug 103698

Lines 1-24 Link Here

(-)./files/patch-contrib_asdf-install_installer.lisp (-24 lines)
1	Index: contrib/asdf-install/installer.lisp
2	===================================================================
3	RCS file: /cvsroot/sbcl/sbcl/contrib/asdf-install/installer.lisp,v
4	retrieving revision 1.15
5	diff -u -r1.15 installer.lisp
6	--- contrib/asdf-install/installer.lisp 12 Jan 2006 13:26:41 -0000 1.15
7	+++ contrib/asdf-install/installer.lisp 16 Apr 2006 23:07:05 -0000
8	@@ -264,11 +264,15 @@
9	:wait t)
10	(error "can't untar"))))
11	(dummy (princ tar))
12	+ (pos-start (if (and (>= (length tar) 2)
13	+ (string= (subseq tar 0 2) "x "))
14	+ 2 ; bsdtar
15	+ 0)) ; GNU tar
16	(pos-slash (position #\/ tar))
17	(default-pathname-defaults
18	(merge-pathnames
19	(make-pathname :directory
20	- `(:relative ,(subseq tar 0 pos-slash)))
21	+ `(:relative ,(subseq tar pos-start pos-slash)))
22	source)))
23	(declare (ignore dummy))
24	(loop for asd in (directory