From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 16 23:50:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BA4216A405 for ; Sun, 16 Apr 2006 23:50:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B46F643D48 for ; Sun, 16 Apr 2006 23:50:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3GNoGFY099460 for ; Sun, 16 Apr 2006 23:50:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3GNoGHA099455; Sun, 16 Apr 2006 23:50:16 GMT (envelope-from gnats) Resent-Date: Sun, 16 Apr 2006 23:50:16 GMT Resent-Message-Id: <200604162350.k3GNoGHA099455@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, NIIMI Satoshi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0897D16A402 for ; Sun, 16 Apr 2006 23:43:29 +0000 (UTC) (envelope-from sa2c@sa2c.net) Received: from sakura.and.or.jp (sakura.and.or.jp [59.106.20.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E26743D46 for ; Sun, 16 Apr 2006 23:43:28 +0000 (GMT) (envelope-from sa2c@sa2c.net) Received: from sakura.and.or.jp (localhost [127.0.0.1]) by sakura.and.or.jp (Postfix) with ESMTP id 3AFCF61C2B for ; Mon, 17 Apr 2006 08:43:27 +0900 (JST) Received: from berkeley.l.sa2c.net (berkeley.vpn.and.or.jp [10.46.49.3]) by sakura.and.or.jp (Postfix) with ESMTP id 154B261C29 for ; Mon, 17 Apr 2006 08:43:27 +0900 (JST) Received: by berkeley.l.sa2c.net (Postfix, from userid 3104) id DDE3311445; Mon, 17 Apr 2006 08:43:26 +0900 (JST) Message-Id: <20060416234326.DDE3311445@berkeley.l.sa2c.net> Date: Mon, 17 Apr 2006 08:43:26 +0900 (JST) From: NIIMI Satoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95901: MAINTAINER: lang/sbcl: remove dependency on archivers/gtar X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: NIIMI Satoshi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Apr 2006 23:50:17 -0000 >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 -.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: