Date: Mon, 11 Jan 2010 05:40:38 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/142709: [PATCH] lang/gnat-doc-html: use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001110540.o0B5ecss006702@newbie.thingamajig-systems.co.uk> Resent-Message-ID: <201001110550.o0B5o0vf022632@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142709
>Category: ports
>Synopsis: [PATCH] lang/gnat-doc-html: use $SUB_FILES to dynamically adjust pkg-message
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 11 05:50:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 21:11:58 UTC
>Description:
ignore port is NOPORTDOCS is defined
use $SUB_FILES to dynamically adjust pkg-message
don't re-define DOCSDIR in Makefile
use DOCSDIR macro in pkg message & plist files
Added file(s):
- files/pkg-message_html.in
- files/pkg-message_info.in
- files/pkg-message_ps.in
- files/pkg-message_texi.in
- files/pkg-message_txt.in
Removed file(s):
- pkg-message_html
- pkg-message_info
- pkg-message_ps
- pkg-message_texi
- pkg-message_txt
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- gnat-doc-html-3.15p.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/gnat-doc-html/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 11 Sep 2005 08:50:43 -0000 1.8
+++ Makefile 11 Jan 2010 05:39:09 -0000
@@ -26,10 +26,9 @@
WRKSRC= ${WRKDIR}/gnat-${PORTVERSION}-unx-docs
NO_BUILD= yes
PLIST= ${MASTERDIR}/pkg-plist_${DOCFORMAT}
-PKGMESSAGE= ${MASTERDIR}/pkg-message_${DOCFORMAT}
+SUB_FILES= pkg-message_${DOCFORMAT}
DOCFORMAT?= html
-DOCSDIR= ${PREFIX}/share/doc/gnat/${DOCFORMAT}
SEC_LABEL= "Programming & development tools."
INSTALL_INFO= install-info --section=${SEC_LABEL}
@@ -50,13 +49,11 @@
@${FALSE}
.endif
-pre-install:
- @${CP} ${PKGDIR}/pkg-plist_${DOCFORMAT} ${WRKDIR}
- @${CP} ${PKGDIR}/pkg-message_${DOCFORMAT} ${WRKDIR}
+.ifdef NOPORTDOCS
+IGNORE= this port only contains documentation, please undefine NOPORTDOCS and try again
+.endif
do-install:
-.if !defined(NOPORTDOCS)
-
.if ${DOCFORMAT} == "info"
@${MKDIR} ${PREFIX}/info
@${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${PREFIX}/info
@@ -65,15 +62,11 @@
@${INSTALL_INFO} --item=${RM_LABEL} ${PREFIX}/info/gnat_rm.info ${PREFIX}/info/dir
@${INSTALL_INFO} --item=${UG_LABEL} ${PREFIX}/info/gnat_ug.info ${PREFIX}/info/dir
.else
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${DOCSDIR}
-.endif
-
+ @${MKDIR} ${DOCSDIR}/${DOCFORMAT}
+ @${INSTALL_MAN} ${WRKSRC}/${DOCFORMAT}/* ${DOCSDIR}/${DOCFORMAT}
.endif
post-install:
-.if !defined(NOPORTDOCS)
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/local:${PREFIX}:'
-.endif
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: pkg-message_html
===================================================================
RCS file: pkg-message_html
diff -N pkg-message_html
--- pkg-message_html 12 Dec 2002 07:58:25 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-
-*********************************************************************
-
-NOTE:
-
-You may find it useful to add the following URL's to your browser:
-
- Ada 95 Annotated Reference Manual
- file:///usr/local/share/doc/gnat/html/arm95.html
-
- GNAT gcc 2.8.1 Compiler Manual
- file:///usr/local/share/doc/gnat/html/gcc.html
-
- GNAT Reference Manual
- file:///usr/local/share/doc/gnat/html/gnat_rm.html
-
- GNAT User Guide
- file:///usr/local/share/doc/gnat/html/gnat_ug.html
-
-*********************************************************************
-
Index: pkg-message_info
===================================================================
RCS file: pkg-message_info
diff -N pkg-message_info
--- pkg-message_info 5 Dec 2001 05:51:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-
-*********************************************************************
-
-NOTE:
-
-GNU info browser entries have been installed in /usr/local/info/dir.
-If entries do not appear in your info browser, make sure that
-/usr/local/info is in your INFOPATH.
-
-*********************************************************************
-
Index: pkg-message_ps
===================================================================
RCS file: pkg-message_ps
diff -N pkg-message_ps
--- pkg-message_ps 5 Dec 2001 05:51:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-
-*********************************************************************
-
-NOTE:
-
-Postscript documentation has been installed in
-/usr/local/share/doc/gnat/ps.
-
-*********************************************************************
-
Index: pkg-message_texi
===================================================================
RCS file: pkg-message_texi
diff -N pkg-message_texi
--- pkg-message_texi 5 Dec 2001 05:51:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-
-*********************************************************************
-
-NOTE:
-
-TeXi documentation has been installed in
-/usr/local/share/doc/gnat/texi.
-
-*********************************************************************
-
Index: pkg-message_txt
===================================================================
RCS file: pkg-message_txt
diff -N pkg-message_txt
--- pkg-message_txt 5 Dec 2001 05:51:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-
-*********************************************************************
-
-NOTE:
-
-ASCII Text documentation has been installed in
-/usr/local/share/gnat/txt.
-
-*********************************************************************
-
Index: pkg-plist_html
===================================================================
RCS file: /home/ncvs/ports/lang/gnat-doc-html/pkg-plist_html,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist_html
--- pkg-plist_html 19 Dec 2003 23:22:07 -0000 1.4
+++ pkg-plist_html 11 Jan 2010 05:39:09 -0000
@@ -1,18 +1,18 @@
-share/doc/gnat/html/arm95.html
-share/doc/gnat/html/assembly.gif
-share/doc/gnat/html/breakpoints.gif
-share/doc/gnat/html/canvas.gif
-share/doc/gnat/html/colors.gif
-share/doc/gnat/html/explorer.gif
-share/doc/gnat/html/gcc.html
-share/doc/gnat/html/gdb.html
-share/doc/gnat/html/gnat_rm.html
-share/doc/gnat/html/gnat_ug.html
-share/doc/gnat/html/gvd.html
-share/doc/gnat/html/main-window.gif
-share/doc/gnat/html/memory-view.gif
-share/doc/gnat/html/process.gif
-share/doc/gnat/html/tasks.gif
-share/doc/gnat/html/tooltips.gif
-@dirrm share/doc/gnat/html
-@dirrm share/doc/gnat
+%%DOCSDIR%%/html/arm95.html
+%%DOCSDIR%%/html/assembly.gif
+%%DOCSDIR%%/html/breakpoints.gif
+%%DOCSDIR%%/html/canvas.gif
+%%DOCSDIR%%/html/colors.gif
+%%DOCSDIR%%/html/explorer.gif
+%%DOCSDIR%%/html/gcc.html
+%%DOCSDIR%%/html/gdb.html
+%%DOCSDIR%%/html/gnat_rm.html
+%%DOCSDIR%%/html/gnat_ug.html
+%%DOCSDIR%%/html/gvd.html
+%%DOCSDIR%%/html/main-window.gif
+%%DOCSDIR%%/html/memory-view.gif
+%%DOCSDIR%%/html/process.gif
+%%DOCSDIR%%/html/tasks.gif
+%%DOCSDIR%%/html/tooltips.gif
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
Index: pkg-plist_ps
===================================================================
RCS file: /home/ncvs/ports/lang/gnat-doc-html/pkg-plist_ps,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist_ps
--- pkg-plist_ps 19 Dec 2003 23:22:07 -0000 1.4
+++ pkg-plist_ps 11 Jan 2010 05:39:09 -0000
@@ -1,8 +1,8 @@
-share/doc/gnat/ps/arm95.ps
-share/doc/gnat/ps/gcc.ps
-share/doc/gnat/ps/gdb.ps
-share/doc/gnat/ps/gnat_rm.ps
-share/doc/gnat/ps/gnat_ug.ps
-share/doc/gnat/ps/gvd.ps
-@dirrm share/doc/gnat/ps
-@dirrm share/doc/gnat
+%%DOCSDIR%%/ps/arm95.ps
+%%DOCSDIR%%/ps/gcc.ps
+%%DOCSDIR%%/ps/gdb.ps
+%%DOCSDIR%%/ps/gnat_rm.ps
+%%DOCSDIR%%/ps/gnat_ug.ps
+%%DOCSDIR%%/ps/gvd.ps
+@dirrm %%DOCSDIR%%/ps
+@dirrm %%DOCSDIR%%
Index: pkg-plist_texi
===================================================================
RCS file: /home/ncvs/ports/lang/gnat-doc-html/pkg-plist_texi,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist_texi
--- pkg-plist_texi 19 Dec 2003 23:22:07 -0000 1.4
+++ pkg-plist_texi 11 Jan 2010 05:39:09 -0000
@@ -1,18 +1,18 @@
-share/doc/gnat/texi/arm95.texi
-share/doc/gnat/texi/cpp.texi
-share/doc/gnat/texi/extend.texi
-share/doc/gnat/texi/gcc.texi
-share/doc/gnat/texi/gcov.texi
-share/doc/gnat/texi/gfdl.texi
-share/doc/gnat/texi/gnat_rm.texi
-share/doc/gnat/texi/gnat_ug_unx.texi
-share/doc/gnat/texi/gvd.texi
-share/doc/gnat/texi/install.texi
-share/doc/gnat/texi/invoke.texi
-share/doc/gnat/texi/md.texi
-share/doc/gnat/texi/rtl.texi
-share/doc/gnat/texi/texinfo.tex
-share/doc/gnat/texi/texiplus.tex
-share/doc/gnat/texi/tm.texi
-@dirrm share/doc/gnat/texi
-@dirrm share/doc/gnat
+%%DOCSDIR%%/texi/arm95.texi
+%%DOCSDIR%%/texi/cpp.texi
+%%DOCSDIR%%/texi/extend.texi
+%%DOCSDIR%%/texi/gcc.texi
+%%DOCSDIR%%/texi/gcov.texi
+%%DOCSDIR%%/texi/gfdl.texi
+%%DOCSDIR%%/texi/gnat_rm.texi
+%%DOCSDIR%%/texi/gnat_ug_unx.texi
+%%DOCSDIR%%/texi/gvd.texi
+%%DOCSDIR%%/texi/install.texi
+%%DOCSDIR%%/texi/invoke.texi
+%%DOCSDIR%%/texi/md.texi
+%%DOCSDIR%%/texi/rtl.texi
+%%DOCSDIR%%/texi/texinfo.tex
+%%DOCSDIR%%/texi/texiplus.tex
+%%DOCSDIR%%/texi/tm.texi
+@dirrm %%DOCSDIR%%/texi
+@dirrm %%DOCSDIR%%
Index: pkg-plist_txt
===================================================================
RCS file: /home/ncvs/ports/lang/gnat-doc-html/pkg-plist_txt,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist_txt
--- pkg-plist_txt 19 Dec 2003 23:22:07 -0000 1.4
+++ pkg-plist_txt 11 Jan 2010 05:39:09 -0000
@@ -1,8 +1,8 @@
-share/doc/gnat/txt/arm95.txt
-share/doc/gnat/txt/gcc.txt
-share/doc/gnat/txt/gdb.txt
-share/doc/gnat/txt/gnat_rm.txt
-share/doc/gnat/txt/gnat_ug.txt
-share/doc/gnat/txt/gvd.txt
-@dirrm share/doc/gnat/txt
-@dirrm share/doc/gnat
+%%DOCSDIR%%/txt/arm95.txt
+%%DOCSDIR%%/txt/gcc.txt
+%%DOCSDIR%%/txt/gdb.txt
+%%DOCSDIR%%/txt/gnat_rm.txt
+%%DOCSDIR%%/txt/gnat_ug.txt
+%%DOCSDIR%%/txt/gvd.txt
+@dirrm %%DOCSDIR%%/txt
+@dirrm %%DOCSDIR%%
Index: files/pkg-message_html.in
===================================================================
RCS file: files/pkg-message_html.in
diff -N files/pkg-message_html.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message_html.in 11 Jan 2010 05:39:09 -0000
@@ -0,0 +1,21 @@
+
+*********************************************************************
+
+NOTE:
+
+You may find it useful to add the following URL's to your browser:
+
+ Ada 95 Annotated Reference Manual
+ file://%%DOCSDIR%%/html/arm95.html
+
+ GNAT gcc 2.8.1 Compiler Manual
+ file://%%DOCSDIR%%/html/gcc.html
+
+ GNAT Reference Manual
+ file://%%DOCSDIR%%/html/gnat_rm.html
+
+ GNAT User Guide
+ file://%%DOCSDIR%%/html/gnat_ug.html
+
+*********************************************************************
+
Index: files/pkg-message_info.in
===================================================================
RCS file: files/pkg-message_info.in
diff -N files/pkg-message_info.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message_info.in 11 Jan 2010 05:39:09 -0000
@@ -0,0 +1,11 @@
+
+*********************************************************************
+
+NOTE:
+
+GNU info browser entries have been installed in %%PREFIX%%/info/dir
+If entries do not appear in your info browser, make sure that
+%%PREFIX%%/info is in your INFOPATH.
+
+*********************************************************************
+
Index: files/pkg-message_ps.in
===================================================================
RCS file: files/pkg-message_ps.in
diff -N files/pkg-message_ps.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message_ps.in 11 Jan 2010 05:39:09 -0000
@@ -0,0 +1,10 @@
+
+*********************************************************************
+
+NOTE:
+
+Postscript documentation has been installed in
+%%DOCSDIR%%/ps
+
+*********************************************************************
+
Index: files/pkg-message_texi.in
===================================================================
RCS file: files/pkg-message_texi.in
diff -N files/pkg-message_texi.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message_texi.in 11 Jan 2010 05:39:09 -0000
@@ -0,0 +1,10 @@
+
+*********************************************************************
+
+NOTE:
+
+TeXi documentation has been installed in
+%%DOCSDIR%%/texi.
+
+*********************************************************************
+
Index: files/pkg-message_txt.in
===================================================================
RCS file: files/pkg-message_txt.in
diff -N files/pkg-message_txt.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message_txt.in 11 Jan 2010 05:39:09 -0000
@@ -0,0 +1,10 @@
+
+*********************************************************************
+
+NOTE:
+
+ASCII Text documentation has been installed in
+%%DOCSDIR%%/txt.
+
+*********************************************************************
+
--- gnat-doc-html-3.15p.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001110540.o0B5ecss006702>