[65983] branches/new-help-system/base

[raimue at macports.org]

Revision: 65983
          http://trac.macports.org/changeset/65983
Author:   raimue at macports.org
Date:     2010-04-04 06:59:48 -0700 (Sun, 04 Apr 2010)
Log Message:
-----------
Use MACPORTS_VERSION in Makefile, moving asciidoc.conf.in file

Modified Paths:
--------------
    branches/new-help-system/base/Mk/macports.autoconf.mk.in
    branches/new-help-system/base/configure.ac
    branches/new-help-system/base/doc/Makefile

Added Paths:
-----------
    branches/new-help-system/base/doc/asciidoc.conf

Removed Paths:
-------------
    branches/new-help-system/base/doc/asciidoc.conf.in

Modified: branches/new-help-system/base/Mk/macports.autoconf.mk.in
===================================================================
--- branches/new-help-system/base/Mk/macports.autoconf.mk.in	2010-04-04 13:53:18 UTC (rev 65982)
+++ branches/new-help-system/base/Mk/macports.autoconf.mk.in	2010-04-04 13:59:48 UTC (rev 65983)
@@ -70,4 +70,6 @@
 mpconfigdir		= @MPCONFIGDIR@
 portsdir		= @PORTSDIR@
 
+MACPORTS_VERSION	= @MACPORTS_VERSION@
+
 SILENT			= @

Modified: branches/new-help-system/base/configure.ac
===================================================================
--- branches/new-help-system/base/configure.ac	2010-04-04 13:53:18 UTC (rev 65982)
+++ branches/new-help-system/base/configure.ac	2010-04-04 13:59:48 UTC (rev 65983)
@@ -346,7 +346,6 @@
 	doc/prefix.mtree
 	doc/macosx.mtree
 	doc/macports.conf
-	doc/asciidoc.conf
 	portmgr/freebsd/Makefile
 	src/Makefile
 	src/macports1.0/macports_autoconf.tcl

Modified: branches/new-help-system/base/doc/Makefile
===================================================================
--- branches/new-help-system/base/doc/Makefile	2010-04-04 13:53:18 UTC (rev 65982)
+++ branches/new-help-system/base/doc/Makefile	2010-04-04 13:59:48 UTC (rev 65983)
@@ -1,5 +1,5 @@
 ASCIIDOC=	${prefix}/bin/asciidoc
-ASCIIDOCFLAGS=	-f asciidoc.conf
+ASCIIDOCFLAGS=	-f asciidoc.conf -amanversion=${MACPORTS_VERSION}
 XSLTPROC=	${prefix}/xsltproc
 XSLTFLAGS=	-nonet
 

Copied: branches/new-help-system/base/doc/asciidoc.conf (from rev 65982, branches/new-help-system/base/doc/asciidoc.conf.in)
===================================================================
--- branches/new-help-system/base/doc/asciidoc.conf	                        (rev 0)
+++ branches/new-help-system/base/doc/asciidoc.conf	2010-04-04 13:59:48 UTC (rev 65983)
@@ -0,0 +1,37 @@
+[attributes]
+mansource=MacPorts
+#manversion is in the Makefile
+manmanual=MacPorts Manual
+guideurl=http://guide.macports.org/
+
+## man: macro
+#
+# Usage: man:command[manpage-section]
+#
+# Note, {0} is the manpage section, while {target} is the command.
+#
+# Show link as: <command>(<section>); if section is defined, else just show
+# the command.
+
+[macros]
+(?su)[\\]?(?P<name>man):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+(?su)[\\]?(?P<name>guide):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+
+ifdef::backend-docbook[]
+[man-inlinemacro]
+<citerefentry>
+    <refentrytitle>{target}</refentrytitle>{0?<manvolnum>{0}</manvolnum>}
+</citerefentry>
+[guide-inlinemacro]
+<ulink url="#{target}">{0={guideurl}{target}}</ulink>
+endif::backend-docbook[]
+
+ifdef::backend-xhtml11[]
+[man-inlinemacro]
+<a href="{guideurl}{target}{0?.{0}}.html">{target}{0?({0})}</a>
+[guide-inlinemacro]
+<a href="{guideurl}#{target}">{0={guideurl}{target}}</a>
+endif::backend-xhtml11[]
+
+[paradef-default]
+cmdsynopsis-style=template="verseparagraph"

Deleted: branches/new-help-system/base/doc/asciidoc.conf.in
===================================================================
--- branches/new-help-system/base/doc/asciidoc.conf.in	2010-04-04 13:53:18 UTC (rev 65982)
+++ branches/new-help-system/base/doc/asciidoc.conf.in	2010-04-04 13:59:48 UTC (rev 65983)
@@ -1,37 +0,0 @@
-[attributes]
-mansource=MacPorts
-manversion=@MACPORTS_VERSION@
-manmanual=MacPorts Manual
-guideurl=http://guide.macports.org/
-
-## man: macro
-#
-# Usage: man:command[manpage-section]
-#
-# Note, {0} is the manpage section, while {target} is the command.
-#
-# Show link as: <command>(<section>); if section is defined, else just show
-# the command.
-
-[macros]
-(?su)[\\]?(?P<name>man):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-(?su)[\\]?(?P<name>guide):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-
-ifdef::backend-docbook[]
-[man-inlinemacro]
-<citerefentry>
-    <refentrytitle>{target}</refentrytitle>{0?<manvolnum>{0}</manvolnum>}
-</citerefentry>
-[guide-inlinemacro]
-<ulink url="#{target}">{0={guideurl}{target}}</ulink>
-endif::backend-docbook[]
-
-ifdef::backend-xhtml11[]
-[man-inlinemacro]
-<a href="{guideurl}{target}{0?.{0}}.html">{target}{0?({0})}</a>
-[guide-inlinemacro]
-<a href="{guideurl}#{target}">{0={guideurl}{target}}</a>
-endif::backend-xhtml11[]
-
-[paradef-default]
-cmdsynopsis-style=template="verseparagraph"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100404/782761b5/attachment.html>