ports/136772: [PATCH] devel/cl-asdf: Respect PORTEXAMPLES + QAT-inspired refinements in Makefile, pkg-plist and pkg-message.in

[Sahil Tandon]

>Number:         136772
>Category:       ports
>Synopsis:       [PATCH] devel/cl-asdf: Respect PORTEXAMPLES + QAT-inspired refinements in Makefile, pkg-plist and pkg-message.in
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 15 03:00:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sahil Tandon
>Release:        7.1-RELEASE
>Organization:
>Environment:
FreeBSD spartan.hamla.org 7.1-RELEASE
>Description:
- Respect PORTEXAMPLES
- pkg-message incorrectly refers to ${PREFIX} instead of %%PREFIX%%
>How-To-Repeat:
- Install and note the literal output of "${PREFIX}" when pkg-message is listed instead of the desired expansion of the variable.
>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/cl-asdf/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	10 Jul 2007 14:06:01 -0000	1.6
+++ Makefile	21 Jun 2009 16:05:03 -0000
@@ -15,6 +15,7 @@
 MAINTAINER=		ports at 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 @@
 		${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>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	3 Jun 2003 02:54:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +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.
-==========================================================================
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/cl-asdf/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	9 Apr 2005 22:18:04 -0000	1.2
+++ pkg-plist	21 Jun 2009 16:05:03 -0000
@@ -9,24 +9,24 @@
 %%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
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	21 Jun 2009 16:05:03 -0000
@@ -0,0 +1,12 @@
+==========================================================================
+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.
+==========================================================================


>Release-Note:
>Audit-Trail:
>Unformatted: