[119705] trunk/base

[cal at macports.org]

Revision: 119705
          https://trac.macports.org/changeset/119705
Author:   cal at macports.org
Date:     2014-05-03 18:20:17 -0700 (Sat, 03 May 2014)
Log Message:
-----------
base: revert r119702, r119703

Revision Links:
--------------
    https://trac.macports.org/changeset/119702
    https://trac.macports.org/changeset/119703

Modified Paths:
--------------
    trunk/base/Doxyfile.in
    trunk/base/Makefile.in

Modified: trunk/base/Doxyfile.in
===================================================================
--- trunk/base/Doxyfile.in	2014-05-04 00:30:26 UTC (rev 119704)
+++ trunk/base/Doxyfile.in	2014-05-04 01:20:17 UTC (rev 119705)
@@ -850,7 +850,7 @@
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        =
+FILTER_PATTERNS        = *.tcl=@prefix@/bin/tcl-dox
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER ) will also be used to filter the input files that are used for
@@ -1001,7 +1001,7 @@
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = docs
+HTML_OUTPUT            = tcldox
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
@@ -2035,7 +2035,7 @@
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2207,7 +2207,7 @@
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               =
+DOT_PATH               = @prefix@/bin/
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2014-05-04 00:30:26 UTC (rev 119704)
+++ trunk/base/Makefile.in	2014-05-04 01:20:17 UTC (rev 119705)
@@ -115,7 +115,7 @@
 
 
 clean::
-	rm -rf docs
+	rm -rf tcldox
 
 distclean::
 	rm -f config.log config.status configure.lineno
@@ -151,11 +151,11 @@
 	${MAKE} SVNTAG=${DISTARCTAG} PKGNAME=${DISTARCNAME} _dopkg
 endif
 
-docs:
-	@[ -e "${prefix}/bin/doxygen" ] \
-		|| { echo "Install doxygen with MacPorts in ${prefix} first."; exit 1; }
+tcldox:
+	@[ -e "${prefix}/bin/doxygen" -a -e "${prefix}/bin/tcl-dox" -a -e "${prefix}/bin/dot" ] \
+		|| { echo "Install doxygen, tcl-dox and graphviz with MacPorts in ${prefix} first."; exit 1; }
 	${prefix}/bin/doxygen
 
 test::
 
-.PHONY: dist _gettag _pkgdist _dopkg docs
+.PHONY: dist _gettag _pkgdist _dopkg tcldoc tcldox
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140503/1886eb47/attachment.html>