[armedbear-cvs] r13038 - in branches/0.23.x/abcl: . contrib/asdf-install

[Mark Evenson]

Author: mevenson
Date: Sat Nov 20 10:41:55 2010
New Revision: 13038

Log:
[backport r13034] Better resolution mechanism for 'gpg' binary.



Modified:
   branches/0.23.x/abcl/CHANGES
   branches/0.23.x/abcl/contrib/asdf-install/asdf-install.asd
   branches/0.23.x/abcl/contrib/asdf-install/port.lisp
   branches/0.23.x/abcl/contrib/asdf-install/variables.lisp

Modified: branches/0.23.x/abcl/CHANGES
==============================================================================
--- branches/0.23.x/abcl/CHANGES	(original)
+++ branches/0.23.x/abcl/CHANGES	Sat Nov 20 10:41:55 2010
@@ -13,7 +13,9 @@
 
 * [svn r12994] New java-interop macros: CHAIN and JMETHOD-LET
 
-* [svn r13031] Ensure that the ASDF registry contains the ASDF-INSTALL locations.
+* [svn r13030-31,r13034] ASDF-INSTALL improvements: Ensure that the
+     ASDF registry contains the ASDF-INSTALL locations.  Better
+     resolution mechanism for 'gpg' binary.
 
 Fixes
 -----

Modified: branches/0.23.x/abcl/contrib/asdf-install/asdf-install.asd
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/asdf-install.asd	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/asdf-install.asd	Sat Nov 20 10:41:55 2010
@@ -12,7 +12,7 @@
 (defsystem asdf-install
   #+:sbcl :depends-on
   #+:sbcl (sb-bsd-sockets)
-  :version "0.6.10-ABCL.0"
+  :version "0.6.10-ABCL.1"
   :author "Dan Barlow <dan at telent.net>, Edi Weitz <edi at agharta.de> and many others. See the file COPYRIGHT for more details."
   :maintainer "Gary Warren King <gwking at metabang.com>"
   :components ((:file "defpackage")

Modified: branches/0.23.x/abcl/contrib/asdf-install/port.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/port.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/port.lisp	Sat Nov 20 10:41:55 2010
@@ -384,12 +384,15 @@
     (pushnew tmp *temporary-files*)
     (values (download-url-to-file url tmp) tmp)))
 
+(defun gpg-command () 
+  (find-shell-command *gpg-command*))
+
 (defun gpg-results (package signature)
   (let ((tags nil))
     (with-input-from-string
 	(gpg-stream 
 	 (shell-command (format nil "~s --status-fd 1 --verify ~s ~s"
-                                *gpg-command*
+                                (gpg-command)
 				(namestring signature) (namestring package))))
       (loop for l = (read-line gpg-stream nil nil)
 	 while l

Modified: branches/0.23.x/abcl/contrib/asdf-install/variables.lisp
==============================================================================
--- branches/0.23.x/abcl/contrib/asdf-install/variables.lisp	(original)
+++ branches/0.23.x/abcl/contrib/asdf-install/variables.lisp	Sat Nov 20 10:41:55 2010
@@ -48,7 +48,9 @@
 
 ;; bin first
 (defvar *shell-search-paths* '((:absolute "bin")
-                               (:absolute "usr" "bin"))
+                               (:absolute "usr" "bin")
+                               (:absolute "usr" "local" "bin")
+                               (:absolute "opt" "local" "bin"))
   "A list of places to look for shell commands.")
 
 (defvar *gnu-tar-program*