Date: Mon, 17 Apr 2006 08:43:26 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95901: MAINTAINER: lang/sbcl: remove dependency on archivers/gtar Message-ID: <20060416234326.DDE3311445@berkeley.l.sa2c.net> Resent-Message-ID: <200604162350.k3GNoGHA099455@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95901
>Category: ports
>Synopsis: MAINTAINER: lang/sbcl: remove dependency on archivers/gtar
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 16 23:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: NIIMI Satoshi
>Release: FreeBSD 6.1-RC i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.1-RC FreeBSD 6.1-RC #2: Sun Apr 16 09:37:47 JST 2006 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
lang/sbcl depends on archivers/gtar because of the difference of
bsdtar output and GNU tar output, preceding "x ".
This PR change asdf-install to parse bsdtar's output in addition to
GNU tar's output.
This idea is inspired by Paul Ledbetter III.
>How-To-Repeat:
>Fix:
Plase note to run following before commit.
"cvs rm files/extra-patch-contrib_asdf-install_installer.lisp"
--- sbcl.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/sbcl/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile 11 Apr 2006 19:59:31 -0000 1.31
+++ Makefile 16 Apr 2006 23:39:28 -0000
@@ -7,6 +7,7 @@
PORTNAME= sbcl
PORTVERSION= 0.9.11
+PORTREVISION= 1
CATEGORIES= lang lisp
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sbcl
@@ -45,14 +46,6 @@
.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}
Index: files/extra-patch-contrib_asdf-install_installer.lisp
===================================================================
RCS file: files/extra-patch-contrib_asdf-install_installer.lisp
diff -N files/extra-patch-contrib_asdf-install_installer.lisp
--- files/extra-patch-contrib_asdf-install_installer.lisp 8 Oct 2005 18:21:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: files/patch-contrib_asdf-install_installer.lisp
===================================================================
RCS file: files/patch-contrib_asdf-install_installer.lisp
diff -N files/patch-contrib_asdf-install_installer.lisp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-contrib_asdf-install_installer.lisp 16 Apr 2006 23:07:05 -0000
@@ -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
--- sbcl.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060416234326.DDE3311445>