2 files changed, 35 insertions, 31 deletions

diff --git a/devel/cl-asdf/Makefile b/devel/cl-asdf/Makefile
index 804b7660c2dc..720e9d112753 100644
--- a/devel/cl-asdf/Makefile
+++ b/devel/cl-asdf/Makefile
@@ -6,19 +6,21 @@
 
 PORTNAME=		asdf
 PORTVERSION=		2003.05.16
+PORTREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		http://www.henrik-motakef.de/freebsd-distfiles/asdf/
+MASTER_SITES=		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	pav
 PKGNAMEPREFIX=		cl-
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		A system definition facility for Common Lisp
 
-BROKEN=			Incomplete pkg-plist
-
 WRKSRC=			${WRKDIR}/${PORTNAME}
 NO_BUILD=		yes # Sources only, see cl-asdf-[cmucl|sbcl|clisp]
 CL_LIBDIR=		${PREFIX}/lib/common-lisp
 ASDF_SYSTEM_REGISTRY=	${CL_LIBDIR}/system-registry
+DOCSDIR=		${PREFIX}/share/doc/${UNIQUENAME}
+EXAMPLESDIR=		${PREFIX}/share/examples/${UNIQUENAME}
 
 do-install:
 	${MKDIR} ${CL_LIBDIR}/asdf
@@ -35,10 +37,10 @@ do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/cl-asdf/
 	${MKDIR} ${PREFIX}/share/examples/cl-asdf/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cl-asdf/
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/cl-asdf/
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/cl-asdf/
-	${INSTALL_DATA} ${WRKSRC}/test/* ${PREFIX}/share/examples/cl-asdf/
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/
+	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}/
 .endif
 
 post-install:
diff --git a/devel/cl-asdf/pkg-plist b/devel/cl-asdf/pkg-plist
index 7e02263e140c..3fa9daa6d5b6 100644
--- a/devel/cl-asdf/pkg-plist
+++ b/devel/cl-asdf/pkg-plist
@@ -1,30 +1,32 @@
 lib/common-lisp/asdf/asdf.lisp
 lib/common-lisp/asdf/wild-modules.lisp
+@unexec if cmp -s %D/etc/asdf-init.lisp.default %D/etc/asdf-init.lisp; then rm -f %D/etc/asdf-init.lisp; fi
 etc/asdf-init.lisp.default
+@exec [ -f %D/etc/asdf-init.lisp ] || cp %D/etc/asdf-init.lisp.default %D/etc/asdf-init.lisp
 @dirrm lib/common-lisp/asdf
 @dirrm lib/common-lisp/system-registry
-%%PORTDOCS%%share/doc/cl-asdf/README
-%%PORTDOCS%%share/doc/cl-asdf/README.FreeBSD
-%%PORTDOCS%%share/doc/cl-asdf/LICENSE
-%%PORTDOCS%%share/examples/cl-asdf/file1.lisp
-%%PORTDOCS%%share/examples/cl-asdf/file2.lisp
-%%PORTDOCS%%share/examples/cl-asdf/file3.lisp
-%%PORTDOCS%%share/examples/cl-asdf/file4.lisp
-%%PORTDOCS%%share/examples/cl-asdf/run-tests.sh
-%%PORTDOCS%%share/examples/cl-asdf/test1.asd
-%%PORTDOCS%%share/examples/cl-asdf/test1.script
-%%PORTDOCS%%share/examples/cl-asdf/test2.asd
-%%PORTDOCS%%share/examples/cl-asdf/test2.script
-%%PORTDOCS%%share/examples/cl-asdf/test2a.asd
-%%PORTDOCS%%share/examples/cl-asdf/test2b1.asd
-%%PORTDOCS%%share/examples/cl-asdf/test2b2.asd
-%%PORTDOCS%%share/examples/cl-asdf/test2b3.asd
-%%PORTDOCS%%share/examples/cl-asdf/test3.asd
-%%PORTDOCS%%share/examples/cl-asdf/test3.script
-%%PORTDOCS%%share/examples/cl-asdf/test4.script
-%%PORTDOCS%%share/examples/cl-asdf/wild-module.asd
-%%PORTDOCS%%share/examples/cl-asdf/wild-module.script
-%%PORTDOCS%%@dirrm share/examples/cl-asdf
-%%PORTDOCS%%@dirrm share/doc/cl-asdf
-@exec [ -f %D/etc/asdf-init.lisp ] || cp %D/etc/asdf-init.lisp.default %D/etc/asdf-init.lisp
+@dirrm lib/common-lisp
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%EXAMPLESDIR%%/file1.lisp
+%%PORTDOCS%%%%EXAMPLESDIR%%/file2.lisp
+%%PORTDOCS%%%%EXAMPLESDIR%%/file3.lisp
+%%PORTDOCS%%%%EXAMPLESDIR%%/file4.lisp
+%%PORTDOCS%%%%EXAMPLESDIR%%/run-tests.sh
+%%PORTDOCS%%%%EXAMPLESDIR%%/test1.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test1.script
+%%PORTDOCS%%%%EXAMPLESDIR%%/test2.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test2.script
+%%PORTDOCS%%%%EXAMPLESDIR%%/test2a.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test2b1.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test2b2.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test2b3.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test3.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/test3.script
+%%PORTDOCS%%%%EXAMPLESDIR%%/test4.script
+%%PORTDOCS%%%%EXAMPLESDIR%%/wild-module.asd
+%%PORTDOCS%%%%EXAMPLESDIR%%/wild-module.script
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/lib/common-lisp/system-registry