3 files changed, 26 insertions, 23 deletions

diff --git a/devel/cl-asdf/Makefile b/devel/cl-asdf/Makefile
index 4298ef9b1ed6..c2a13b77a7b9 100644
--- a/devel/cl-asdf/Makefile
+++ b/devel/cl-asdf/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX=		cl-
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		A system definition facility for Common Lisp
 
+SUB_FILES+=		pkg-message
 WRKSRC=			${WRKDIR}/${PORTNAME}
 NO_BUILD=		yes # Sources only, see cl-asdf-[cmucl|sbcl|clisp]
 CL_LIBDIR=		${PREFIX}/lib/common-lisp
@@ -37,15 +38,17 @@ do-install:
 		${CP} ${PREFIX}/etc/asdf-init.lisp.default \
 		${PREFIX}/etc/asdf-init.lisp
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/cl-asdf/
-	${MKDIR} ${PREFIX}/share/examples/cl-asdf/
+	${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}/
 .endif
 
 post-install:
-	@${CAT} ${MASTERDIR}/pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/cl-asdf/pkg-message b/devel/cl-asdf/files/pkg-message.in
index 5d306053baf5..0fcc61506e7b 100644
--- a/devel/cl-asdf/pkg-message
+++ b/devel/cl-asdf/files/pkg-message.in
@@ -5,7 +5,7 @@ definition files.
 
 A default configuration is installed in
 
-  ${PREFIX}/etc/asdf-init.lisp
+  %%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/pkg-plist b/devel/cl-asdf/pkg-plist
index 3fa9daa6d5b6..29aac1b64a32 100644
--- a/devel/cl-asdf/pkg-plist
+++ b/devel/cl-asdf/pkg-plist
@@ -9,24 +9,24 @@ etc/asdf-init.lisp.default
 %%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%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file1.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file2.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file3.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file4.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-tests.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test1.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test1.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test2.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test2.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test2a.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test2b1.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test2b2.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test2b3.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test3.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test3.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test4.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wild-module.asd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wild-module.script
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/lib/common-lisp/system-registry