7 files changed, 34 insertions, 74 deletions

diff --git a/devel/cl-asdf/Makefile b/devel/cl-asdf/Makefile
index 5aaea74e899b..a7267beb4abd 100644
--- a/devel/cl-asdf/Makefile
+++ b/devel/cl-asdf/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 # The source tarball was obtained from the project's GIT repository:
-# wget -O asdf-1.374.tar.gz "http://common-lisp.net/gitweb?p=projects/asdf/asdf.git;a=snapshot;h=f6dfe94d2836534a7be050127123cc16fee87c48;sf=tgz"
+# wget -O asdf-2.017.tar.gz "http://common-lisp.net/gitweb?p=projects/asdf/asdf.git;a=snapshot;h=db16d0cc1a15697f831bcacc9429cc578304b6cb;sf=tgz"
 
 PORTNAME=	asdf
-PORTVERSION=	1.374
-PORTREVISION=	5
+PORTVERSION=	2.017
 PORTEPOCH=	1
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
@@ -42,7 +41,6 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk
index 1a25f7c01853..c17711b172ff 100644
--- a/devel/cl-asdf/bsd.cl-asdf.mk
+++ b/devel/cl-asdf/bsd.cl-asdf.mk
@@ -57,10 +57,8 @@ RUN_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
 # Even if the Common Lisp compiler already has a bundled ASDF framework,
 # we still need the asdf-init file.
 
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf \
-		${LOCALBASE}/${CL_LIBDIR_REL}/asdf-binary-locations/asdf-binary-locations.asd:${PORTSDIR}/devel/cl-asdf-binary-locations
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf \
-		${LOCALBASE}/${CL_LIBDIR_REL}/asdf-binary-locations/asdf-binary-locations.asd:${PORTSDIR}/devel/cl-asdf-binary-locations
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf
 
 .endif # defined(USE_ASDF)
 
diff --git a/devel/cl-asdf/distinfo b/devel/cl-asdf/distinfo
index 933d4d64a774..f95037c63563 100644
--- a/devel/cl-asdf/distinfo
+++ b/devel/cl-asdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asdf-1.374.tar.gz) = 685b6a0f7bbf968c9d4803c2971a3df36e5b605d24ee852985a3db2f5d6dedd3
-SIZE (asdf-1.374.tar.gz) = 106093
+SHA256 (asdf-2.017.tar.gz) = 754a345155101080c9f97f29610098bef9aa2603e20afba8c9e4ae3f42ea67f0
+SIZE (asdf-2.017.tar.gz) = 168129
diff --git a/devel/cl-asdf/files/README.FreeBSD b/devel/cl-asdf/files/README.FreeBSD
deleted file mode 100644
index 597845c8a18e..000000000000
--- a/devel/cl-asdf/files/README.FreeBSD
+++ /dev/null
@@ -1,11 +0,0 @@
-To use asdf and depending ports, you will have to configure your
-Lisp systems so they know where to find asdf itself and the system
-definition files.
-
-A default configuration is installed in
-
-  ${PREFIX}/etc/asdf-init.lisp
-
-Review this file for further information, or simply load it from your
-Lisp initialization file.
-
diff --git a/devel/cl-asdf/files/asdf-init.lisp b/devel/cl-asdf/files/asdf-init.lisp
index 4f484c10fa0d..0306df215d07 100644
--- a/devel/cl-asdf/files/asdf-init.lisp
+++ b/devel/cl-asdf/files/asdf-init.lisp
@@ -36,22 +36,22 @@
 ;; This file takes all necessary actions. The easiest way is to load
 ;; it in your Lisp every time it starts, by putting
 ;;
-;;  (load "%%PREFIX%%/etc/asdf-init.lisp")
+;;  (load "/usr/local/etc/asdf-init.lisp")
 ;;
 ;; in your init file.
 ;;
 ;; Each Lisp implementation has its own files where this can be done:
 ;;
 ;; CLISP:
-;;   %%PREFIX%%/lib/clisp/config.lisp
+;;   /usr/local/lib/clisp/config.lisp
 ;;   ~/.clisprc
 ;;
 ;; CMUCL:
-;;   %%PREFIX%%/lib/cmucl/lib/cmucl/lib/site-init.lisp
+;;   /usr/local/lib/cmucl/lib/cmucl/lib/site-init.lisp
 ;;   ~/.cmucl-init.lisp
 ;;
 ;; SBCL:
-;;   %%PREFIX%%/etc/sbclrc
+;;   /usr/local/etc/sbclrc
 ;;   ~/.sbclrc
 ;;
 ;; CLOZURE CL / OPENMCL:
@@ -71,7 +71,7 @@
 ;; We mess around with asdf:output-files in interesting ways to
 ;; enforce a filesystem layout that works without multiple Lisp
 ;; implementations overwriting their fasls. Basically, each lib has
-;; its own directory in %%PREFIX%%/lib/common-lisp, initially
+;; its own directory in /usr/local/lib/common-lisp, initially
 ;; containing its sources. Each fasl port will create an
 ;; implementation-specific subdirectory where all its fasls go, for
 ;; example ./cmuclfasl, ./clispfasl etc.
@@ -130,15 +130,15 @@
 
 (defvar *asdf-pathname*
   ;; Clozure CL's internal asdf
-  #+openmcl "%%PREFIX%%/lib/ccl/tools/asdf"
+  #+openmcl "/usr/local/lib/ccl/tools/asdf"
   ;; SBCL's internal asdf
-  #+sbcl "%%PREFIX%%/lib/sbcl/asdf/asdf"
+  #+sbcl "/usr/local/lib/sbcl/asdf/asdf"
   ;; CMU and clisp
-  #-(or openmcl sbcl) "%%PREFIX%%/lib/common-lisp/asdf/asdf"
+  #-(or openmcl sbcl) "/usr/local/lib/common-lisp/asdf/asdf"
   "Path of the ASDF library")
 
 (defvar *system-registry*
-  "%%PREFIX%%/lib/common-lisp/system-registry/"
+  "/usr/local/lib/common-lisp/system-registry/"
   "FreeBSD's contribution to the central registry for ASDF system
 definitions.  This will be added to asdf:*central-registry*, you
 should modify that in order to add other directories.")
@@ -210,22 +210,6 @@ LISP-SPECIFIC-FASL-SUBDIR as well."
 
 (pushnew *system-registry* asdf:*central-registry*)
 
-;; The bundled ASDFs in SBCL and Clozure CL need asdf-binary-locations
-#+sbcl (asdf:operate 'asdf:load-op :asdf-binary-locations)
-#+openmcl (asdf:operate 'asdf:load-op :asdf-binary-locations)
-
-(defun asdf:implementation-specific-directory-name ()
-  "Return a name that can be used as a directory name that is unique to
-a Lisp implementation, Lisp implementation version, operating system,
-and hardware architecture. This implementation is designed for the
-FreeBSD ports system and returns a simplified directory name (sbclfasl,
-clispfasl, ...) by calling lisp-specific-fasl-subdir."
-  (lisp-specific-fasl-subdir))
-
-(setf asdf:*source-to-target-mappings*
-      '(#+openmcl ("%%PREFIX%%/lib/ccl/" nil)
-        #+sbcl ("%%PREFIX%%/lib/sbcl/" nil)))
-
 (defmethod asdf:output-files :around ((op asdf:compile-op)
                                       (file asdf:cl-source-file))
   (let ((default-output-file (car (call-next-method))))
@@ -236,9 +220,16 @@ clispfasl, ...) by calling lisp-specific-fasl-subdir."
       :defaults default-output-file))))
 
 ;; Map each library in common-lisp/ to its fasl subdirectory
-(dolist (path (directory "%%PREFIX%%/lib/common-lisp/*/"))
-  (let ((fasldir (make-pathname :directory (append (pathname-directory path) (list (lisp-specific-fasl-subdir))))))
-    (pushnew (list path fasldir) asdf:*source-to-target-mappings*)))
+
+(defvar *freebsd-output-translations* ())
+
+(pushnew :inherit-configuration *freebsd-output-translations*)
+
+(dolist (path (directory "/usr/local/lib/common-lisp/*/"))
+  (let ((fasldir (make-pathname 
+		  :directory (append (pathname-directory path)
+				     (list (lisp-specific-fasl-subdir))))))
+    (pushnew (list path fasldir) *freebsd-output-translations*)))
 
 (if (and (getenv "FBSD_ASDF_COMPILE_PORT")
          (getenv "PORTNAME")
@@ -247,9 +238,14 @@ clispfasl, ...) by calling lisp-specific-fasl-subdir."
           (portname (getenv "PORTNAME")))
       ;; If we are building a FreeBSD port, all the compiled fasl files
       ;; should be redirected to WRKSRC.
-      (let ((port-source (make-pathname 
-                          :directory (append (pathname-directory #P"%%PREFIX%%/lib/common-lisp/") 
-                                             (list portname)))))
-        (pushnew (list port-source wrksrc) asdf:*source-to-target-mappings*))))
+      (let ((source (make-pathname
+		     :directory (append (pathname-directory #P"/usr/local/lib/common-lisp/")
+					(list portname :wild-inferiors))))
+            (target (make-pathname
+		     :directory (append (pathname-directory wrksrc)
+					(list :wild-inferiors)))))
+	(pushnew (list source target) *freebsd-output-translations*))))
+
+(asdf:initialize-output-translations (cons :output-translations *freebsd-output-translations*))
 
 ;;;; asdf-init.lisp ends here
diff --git a/devel/cl-asdf/files/patch-asdf.lisp b/devel/cl-asdf/files/patch-asdf.lisp
deleted file mode 100644
index ab400b695bc5..000000000000
--- a/devel/cl-asdf/files/patch-asdf.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- asdf.lisp.orig
-+++ asdf.lisp
-@@ -630,7 +630,8 @@
-             (system-source-file (cdr system-pair)))))))
- 
- (defvar *central-registry*
--  `((directory-namestring *default-pathname-defaults*))
-+  `((directory-namestring *default-pathname-defaults*)
-+     "%%PREFIX%%/lib/common-lisp/system-registry/")
- "A list of 'system directory designators' ASDF uses to find systems.
- 
- A 'system directory designator' is a pathname or a function
diff --git a/devel/cl-asdf/pkg-plist b/devel/cl-asdf/pkg-plist
index 62832838b437..98f94735f268 100644
--- a/devel/cl-asdf/pkg-plist
+++ b/devel/cl-asdf/pkg-plist
@@ -2,17 +2,11 @@
 etc/asdf-init.lisp.default
 @exec [ -f %D/etc/asdf-init.lisp ] || cp %D/etc/asdf-init.lisp.default %D/etc/asdf-init.lisp
 %%LIB32DIR%%/common-lisp/asdf/asdf-ecl.lisp
-%%LIB32DIR%%/common-lisp/asdf/asdf-install.lisp
 %%LIB32DIR%%/common-lisp/asdf/asdf.asd
 %%LIB32DIR%%/common-lisp/asdf/asdf.lisp
-%%LIB32DIR%%/common-lisp/asdf/cclan-package.lisp
-%%LIB32DIR%%/common-lisp/asdf/cclan.asd
-%%LIB32DIR%%/common-lisp/asdf/cclan.lisp
 %%LIB32DIR%%/common-lisp/asdf/wild-modules.lisp
 %%LIB32DIR%%/common-lisp/system-registry/asdf.asd
-%%LIB32DIR%%/common-lisp/system-registry/cclan.asd
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry %%LIB32DIR%%/common-lisp/system-registry
 @dirrmtry %%LIB32DIR%%/common-lisp/asdf