Index: acl-compat.asd
===================================================================
RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/acl-compat.asd,v
retrieving revision 1.55
diff -u -w -r1.55 acl-compat.asd
--- acl-compat.asd	21 Jun 2006 08:06:47 -0000	1.55
+++ acl-compat.asd	16 Jul 2009 11:54:58 -0000
@@ -5,7 +5,7 @@
 ;;;; (hint, hint)
 
 (defpackage #:acl-compat-system
-  (:use #:cl #:asdf))
+  (:use #:cl #:asdf #:portacl))
 (in-package #:acl-compat-system)
 
 ;;;; gray stream support for cmucl: Debian/common-lisp-controller has
@@ -78,39 +78,6 @@
 	(:error (error 'compile-failed :component c :operation operation))
 	(:ignore nil)))))
 
-;;;
-;;; This is thought to reduce reader-conditionals in the system definition
-;;;
-(defclass unportable-cl-source-file (cl-source-file) ()
-  (:documentation
-   "This is for files which contain lisp-system dependent code. Until now those
-are marked by a -system postfix but we could later change that to a directory per
-lisp-system"))
-
-(defmethod perform ((op load-op) (c unportable-cl-source-file))
-  (#+cmu ext:without-package-locks
-   #-(or cmu) progn
-     (call-next-method)))
-
-(defmethod perform ((op compile-op) (c unportable-cl-source-file))
-  (#+cmu ext:without-package-locks
-   #-(or cmu) progn
-     (call-next-method)))
-
-(defmethod source-file-type ((c unportable-cl-source-file) (s module))
-  "lisp")
-
-
-(defun lisp-system-shortname ()
-  #+allegro :allegro #+lispworks :lispworks #+cmu :cmucl
-  #+(or mcl openmcl) :mcl #+clisp :clisp #+scl :scl #+sbcl :sbcl) ;mcl/openmcl use the same directory
-
-(defmethod component-pathname ((component unportable-cl-source-file))
-  (let ((pathname (call-next-method))
-        (name (string-downcase (lisp-system-shortname))))
-    (merge-pathnames
-     (make-pathname :directory (list :relative name))
-     pathname)))
 
 ;;;; system
 
@@ -140,31 +107,35 @@
      (:file "lw-buffering" :depends-on ("packages"))
      #-(or allegro (and mcl (not openmcl)))
      (:legacy-cl-source-file "chunked-stream-mixin"
-                             :depends-on ("packages" "acl-excl"
+                             :depends-on ("packages" "~A"
                                                      #-lispworks "lw-buffering"))
+     ;; cheating... this dependency chain is nuts
+     (:port-module "~A"
+      :depends-on ("packages")
+      :components ((:file "acl-excl")))
+     (:port-module "~/implementation/"
+      :depends-on ("packages"
+                   #-(or allegro (and mcl (not openmcl))) "chunked-stream-mixin"
+                   "~A"
+                   #-allegro "acl-excl-common")
+      :components (
      ;; Multiprocessing
-     #+(or mcl openmcl) (:unportable-cl-source-file "mcl-timers")
-     (:unportable-cl-source-file "acl-mp"
-                                 :depends-on ("packages" #+(or mcl openmcl) "mcl-timers"))
+        (:port-file "mcl-timers"
+         :not-found-condition not-necessary)
+        (:file "acl-mp" :depends-on ("mcl-timers"))
      ;; Sockets, networking; TODO: de-frob this a bit
      #-(or mcl openmcl)
-     (:unportable-cl-source-file
-      "acl-socket" :depends-on ("packages" "acl-excl"
-                                           #-(or allegro (and mcl (not openmcl))) "chunked-stream-mixin"))
+        (:file "acl-socket")
      #+(and mcl (not openmcl))
-     (:unportable-cl-source-file "acl-socket-mcl" :depends-on ("packages"))
+        (:file "acl-socket-mcl")
      #+(and mcl (not openmcl) (not carbon-compat)) 
-     (:unportable-cl-source-file
-      "mcl-stream-fix" :depends-on ("acl-socket-mcl"))
+        (:file "mcl-stream-fix" :depends-on ("acl-socket-mcl"))
      #+openmcl
-     (:unportable-cl-source-file
-      "acl-socket-openmcl" :depends-on ("packages" "chunked-stream-mixin"))
+        (:file "acl-socket-openmcl")
+        (:file "acl-sys")
+        ))
      ;; Diverse macros, utility functions
      #-allegro (:file "acl-excl-common" :depends-on ("packages"))
-     (:unportable-cl-source-file "acl-excl" :depends-on
-                                 #-allegro ("acl-excl-common")
-                                 #+allegro ("packages"))
-     (:unportable-cl-source-file "acl-sys" :depends-on ("packages"))
      ;; SSL
      #+(and ssl-available (not (or allegro mcl openmcl clisp)))
      (:file "acl-ssl" :depends-on ("acl-ssl-streams" "acl-socket"))