Update Doxygen from 1.5.1 to 1.5.6.

The substantial change log can be found at:
  http://www.stack.nl/~dimitri/doxygen/changelog.html

patch-ab (http://bugzilla.gnome.org/show_bug.cgi?id=366119) is merged
upstream.  The parts of patch-ab for DESTDIR are retained.  patch-ai
(http://bugzilla.gnome.org/show_bug.cgi?id=366113) is merged upstream.

6 files changed, 93 insertions, 81 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index deaf68f9447..634c9a8a853 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2008/04/12 22:42:59 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2008/06/04 15:05:39 dsainty Exp $
 
-DISTNAME=	doxygen-1.5.1.src
-PKGNAME=	doxygen-1.5.1
-PKGREVISION=	1
+DISTNAME=	doxygen-1.5.6.src
+PKGNAME=	doxygen-1.5.6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index 80867f40512..3543fb87063 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.17 2008/04/14 11:24:02 dsainty Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/06/04 15:05:39 dsainty Exp $
 bin/doxygen
 bin/doxytag
 man/man1/doxygen.1
 man/man1/doxytag.1
-man/man1/doxywizard.1
 share/doc/doxygen/doxygen_manual.pdf
-share/doc/doxygen/examples/.gdb_history
 share/doc/doxygen/examples/Makefile
 share/doc/doxygen/examples/Makefile.in
 share/doc/doxygen/examples/Makefile.win.in
@@ -19,6 +17,7 @@ share/doc/doxygen/examples/afterdoc/html/doxygen.css
 share/doc/doxygen/examples/afterdoc/html/doxygen.png
 share/doc/doxygen/examples/afterdoc/html/files.html
 share/doc/doxygen/examples/afterdoc/html/functions.html
+share/doc/doxygen/examples/afterdoc/html/functions_enum.html
 share/doc/doxygen/examples/afterdoc/html/functions_eval.html
 share/doc/doxygen/examples/afterdoc/html/functions_func.html
 share/doc/doxygen/examples/afterdoc/html/functions_vars.html
@@ -50,11 +49,15 @@ share/doc/doxygen/examples/autolink/html/doxygen.css
 share/doc/doxygen/examples/autolink/html/doxygen.png
 share/doc/doxygen/examples/autolink/html/files.html
 share/doc/doxygen/examples/autolink/html/functions.html
+share/doc/doxygen/examples/autolink/html/functions_enum.html
 share/doc/doxygen/examples/autolink/html/functions_eval.html
 share/doc/doxygen/examples/autolink/html/functions_func.html
 share/doc/doxygen/examples/autolink/html/functions_vars.html
 share/doc/doxygen/examples/autolink/html/globals.html
+share/doc/doxygen/examples/autolink/html/globals_defs.html
+share/doc/doxygen/examples/autolink/html/globals_enum.html
 share/doc/doxygen/examples/autolink/html/globals_eval.html
+share/doc/doxygen/examples/autolink/html/globals_type.html
 share/doc/doxygen/examples/autolink/html/globals_vars.html
 share/doc/doxygen/examples/autolink/html/index.html
 share/doc/doxygen/examples/autolink/html/tab_b.gif
@@ -81,6 +84,8 @@ share/doc/doxygen/examples/define/html/define_8h.html
 share/doc/doxygen/examples/define/html/doxygen.css
 share/doc/doxygen/examples/define/html/doxygen.png
 share/doc/doxygen/examples/define/html/files.html
+share/doc/doxygen/examples/define/html/globals.html
+share/doc/doxygen/examples/define/html/globals_defs.html
 share/doc/doxygen/examples/define/html/index.html
 share/doc/doxygen/examples/define/html/tab_b.gif
 share/doc/doxygen/examples/define/html/tab_l.gif
@@ -120,6 +125,7 @@ share/doc/doxygen/examples/diagrams/html/class_d__coll__graph.png
 share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.map
 share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.md5
 share/doc/doxygen/examples/diagrams/html/class_d__inherit__graph.png
+share/doc/doxygen/examples/diagrams/html/class_e-members.html
 share/doc/doxygen/examples/diagrams/html/class_e.html
 share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.map
 share/doc/doxygen/examples/diagrams/html/class_e__coll__graph.md5
@@ -194,8 +200,6 @@ share/doc/doxygen/examples/docstring/html/doxygen.png
 share/doc/doxygen/examples/docstring/html/files.html
 share/doc/doxygen/examples/docstring/html/functions.html
 share/doc/doxygen/examples/docstring/html/functions_func.html
-share/doc/doxygen/examples/docstring/html/globals.html
-share/doc/doxygen/examples/docstring/html/globals_func.html
 share/doc/doxygen/examples/docstring/html/index.html
 share/doc/doxygen/examples/docstring/html/namespacedocstring.html
 share/doc/doxygen/examples/docstring/html/namespacemembers.html
@@ -215,6 +219,7 @@ share/doc/doxygen/examples/enum/html/doxygen.png
 share/doc/doxygen/examples/enum/html/enum_8h-source.html
 share/doc/doxygen/examples/enum/html/files.html
 share/doc/doxygen/examples/enum/html/functions.html
+share/doc/doxygen/examples/enum/html/functions_enum.html
 share/doc/doxygen/examples/enum/html/functions_eval.html
 share/doc/doxygen/examples/enum/html/index.html
 share/doc/doxygen/examples/enum/html/tab_b.gif
@@ -262,6 +267,8 @@ share/doc/doxygen/examples/func/html/doxygen.css
 share/doc/doxygen/examples/func/html/doxygen.png
 share/doc/doxygen/examples/func/html/files.html
 share/doc/doxygen/examples/func/html/func_8h-source.html
+share/doc/doxygen/examples/func/html/functions.html
+share/doc/doxygen/examples/func/html/functions_func.html
 share/doc/doxygen/examples/func/html/index.html
 share/doc/doxygen/examples/func/html/tab_b.gif
 share/doc/doxygen/examples/func/html/tab_l.gif
@@ -318,6 +325,7 @@ share/doc/doxygen/examples/jdstyle/html/class_test.html
 share/doc/doxygen/examples/jdstyle/html/doxygen.css
 share/doc/doxygen/examples/jdstyle/html/doxygen.png
 share/doc/doxygen/examples/jdstyle/html/functions.html
+share/doc/doxygen/examples/jdstyle/html/functions_enum.html
 share/doc/doxygen/examples/jdstyle/html/functions_eval.html
 share/doc/doxygen/examples/jdstyle/html/functions_func.html
 share/doc/doxygen/examples/jdstyle/html/functions_vars.html
@@ -336,12 +344,35 @@ share/doc/doxygen/examples/memgrp/html/doxygen.png
 share/doc/doxygen/examples/memgrp/html/files.html
 share/doc/doxygen/examples/memgrp/html/functions.html
 share/doc/doxygen/examples/memgrp/html/functions_func.html
+share/doc/doxygen/examples/memgrp/html/globals.html
+share/doc/doxygen/examples/memgrp/html/globals_defs.html
+share/doc/doxygen/examples/memgrp/html/globals_func.html
 share/doc/doxygen/examples/memgrp/html/index.html
 share/doc/doxygen/examples/memgrp/html/memgrp_8cpp.html
 share/doc/doxygen/examples/memgrp/html/tab_b.gif
 share/doc/doxygen/examples/memgrp/html/tab_l.gif
 share/doc/doxygen/examples/memgrp/html/tab_r.gif
 share/doc/doxygen/examples/memgrp/html/tabs.css
+share/doc/doxygen/examples/mux.cfg
+share/doc/doxygen/examples/mux.vhdl
+share/doc/doxygen/examples/mux/html/annotated.html
+share/doc/doxygen/examples/mux/html/classmux__using__with-members.html
+share/doc/doxygen/examples/mux/html/classmux__using__with.html
+share/doc/doxygen/examples/mux/html/classmux__using__with.png
+share/doc/doxygen/examples/mux/html/classmux__using__with_1_1behavior.html
+share/doc/doxygen/examples/mux/html/classmux__using__with_1_1behavior.png
+share/doc/doxygen/examples/mux/html/doxygen.css
+share/doc/doxygen/examples/mux/html/doxygen.png
+share/doc/doxygen/examples/mux/html/files.html
+share/doc/doxygen/examples/mux/html/functions.html
+share/doc/doxygen/examples/mux/html/functions_vars.html
+share/doc/doxygen/examples/mux/html/hierarchy.html
+share/doc/doxygen/examples/mux/html/index.html
+share/doc/doxygen/examples/mux/html/mux_8vhdl.html
+share/doc/doxygen/examples/mux/html/tab_b.gif
+share/doc/doxygen/examples/mux/html/tab_l.gif
+share/doc/doxygen/examples/mux/html/tab_r.gif
+share/doc/doxygen/examples/mux/html/tabs.css
 share/doc/doxygen/examples/overload.cfg
 share/doc/doxygen/examples/overload.cpp
 share/doc/doxygen/examples/overload/html/annotated.html
@@ -349,6 +380,8 @@ share/doc/doxygen/examples/overload/html/class_test-members.html
 share/doc/doxygen/examples/overload/html/class_test.html
 share/doc/doxygen/examples/overload/html/doxygen.css
 share/doc/doxygen/examples/overload/html/doxygen.png
+share/doc/doxygen/examples/overload/html/functions.html
+share/doc/doxygen/examples/overload/html/functions_func.html
 share/doc/doxygen/examples/overload/html/index.html
 share/doc/doxygen/examples/overload/html/tab_b.gif
 share/doc/doxygen/examples/overload/html/tab_l.gif
@@ -406,6 +439,7 @@ share/doc/doxygen/examples/qtstyle/html/class_test.html
 share/doc/doxygen/examples/qtstyle/html/doxygen.css
 share/doc/doxygen/examples/qtstyle/html/doxygen.png
 share/doc/doxygen/examples/qtstyle/html/functions.html
+share/doc/doxygen/examples/qtstyle/html/functions_enum.html
 share/doc/doxygen/examples/qtstyle/html/functions_eval.html
 share/doc/doxygen/examples/qtstyle/html/functions_func.html
 share/doc/doxygen/examples/qtstyle/html/functions_vars.html
@@ -423,6 +457,7 @@ share/doc/doxygen/examples/relates/html/doxygen.css
 share/doc/doxygen/examples/relates/html/doxygen.png
 share/doc/doxygen/examples/relates/html/functions.html
 share/doc/doxygen/examples/relates/html/functions_func.html
+share/doc/doxygen/examples/relates/html/functions_rela.html
 share/doc/doxygen/examples/relates/html/index.html
 share/doc/doxygen/examples/relates/html/tab_b.gif
 share/doc/doxygen/examples/relates/html/tab_l.gif
@@ -452,6 +487,11 @@ share/doc/doxygen/examples/structcmd.h
 share/doc/doxygen/examples/structcmd/html/doxygen.css
 share/doc/doxygen/examples/structcmd/html/doxygen.png
 share/doc/doxygen/examples/structcmd/html/files.html
+share/doc/doxygen/examples/structcmd/html/globals.html
+share/doc/doxygen/examples/structcmd/html/globals_defs.html
+share/doc/doxygen/examples/structcmd/html/globals_func.html
+share/doc/doxygen/examples/structcmd/html/globals_type.html
+share/doc/doxygen/examples/structcmd/html/globals_vars.html
 share/doc/doxygen/examples/structcmd/html/index.html
 share/doc/doxygen/examples/structcmd/html/structcmd_8h-source.html
 share/doc/doxygen/examples/structcmd/html/structcmd_8h.html
@@ -489,6 +529,8 @@ share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4.
 share/doc/doxygen/examples/template/html/class_test_3_01void_01_5_00_01200_01_4.png
 share/doc/doxygen/examples/template/html/doxygen.css
 share/doc/doxygen/examples/template/html/doxygen.png
+share/doc/doxygen/examples/template/html/functions.html
+share/doc/doxygen/examples/template/html/functions_func.html
 share/doc/doxygen/examples/template/html/hierarchy.html
 share/doc/doxygen/examples/template/html/index.html
 share/doc/doxygen/examples/template/html/tab_b.gif
@@ -500,6 +542,7 @@ share/doc/doxygen/html/archoverview.gif
 share/doc/doxygen/html/autolink.html
 share/doc/doxygen/html/commands.html
 share/doc/doxygen/html/config.html
+share/doc/doxygen/html/custcmd.html
 share/doc/doxygen/html/diagrams.html
 share/doc/doxygen/html/docblocks.html
 share/doc/doxygen/html/doxygen.css
@@ -572,6 +615,8 @@ share/doc/doxygen/html/xmlcmds.html
 @dirrm share/doc/doxygen/examples/page
 @dirrm share/doc/doxygen/examples/overload/html
 @dirrm share/doc/doxygen/examples/overload
+@dirrm share/doc/doxygen/examples/mux/html
+@dirrm share/doc/doxygen/examples/mux
 @dirrm share/doc/doxygen/examples/memgrp/html
 @dirrm share/doc/doxygen/examples/memgrp
 @dirrm share/doc/doxygen/examples/jdstyle/html
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 1d29394ce03..4486aa24698 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.30 2007/09/25 14:38:13 joerg Exp $
+$NetBSD: distinfo,v 1.31 2008/06/04 15:05:39 dsainty Exp $
 
-SHA1 (doxygen-1.5.1.src.tar.gz) = eac525c670ef3f1f81c3038588b42e111a9ec6a6
-RMD160 (doxygen-1.5.1.src.tar.gz) = bacd34a5a69833e42e116d997c99df03dd837062
-Size (doxygen-1.5.1.src.tar.gz) = 2888159 bytes
+SHA1 (doxygen-1.5.6.src.tar.gz) = a478176b9183aef299418e655d6e38b8f8f4e4a5
+RMD160 (doxygen-1.5.6.src.tar.gz) = 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b
+Size (doxygen-1.5.6.src.tar.gz) = 4011956 bytes
 SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a
-SHA1 (patch-ab) = 5a9bb8da14b9d7f69319ab2565a15739f3014063
+SHA1 (patch-ab) = f85f15c38877e7d646b3cc981564de8436c2a5af
 SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974
+SHA1 (patch-ad) = 26badd3a4867277f01f5634c9fc25fbe1b93d1c5
 SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
 SHA1 (patch-ah) = aa5a701f0586aa99fdb140f8d7fa63ca14d9f460
-SHA1 (patch-ai) = 0dadf92fdf0b737a6f5bf9467d259581ac8fc33d
diff --git a/devel/doxygen/patches/patch-ab b/devel/doxygen/patches/patch-ab
index d8ee75ba9f4..65ff71ee1e5 100644
--- a/devel/doxygen/patches/patch-ab
+++ b/devel/doxygen/patches/patch-ab
@@ -1,16 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2007/09/23 17:49:08 joerg Exp $
+$NetBSD: patch-ab,v 1.10 2008/06/04 15:05:39 dsainty Exp $
 
-install_docs:
-
-  The "cp -r doc" may by chance copy language.doc with an older modification
-  timestamp than some of its dependencies.  The replacement rule is the
-  intended solution presented on:
-
-  http://bugzilla.gnome.org/show_bug.cgi?id=366119
-
---- Makefile.in.orig	2006-10-19 20:28:46.000000000 +0200
-+++ Makefile.in
-@@ -50,29 +50,22 @@ DATE=$(shell date "+%B %Y")
+--- Makefile.in.orig	2008-06-04 15:03:17.373765859 +1200
++++ Makefile.in	2008-06-04 15:22:33.471205326 +1200
+@@ -53,25 +53,25 @@
  MAN1DIR = man/man1
  
  install: doxywizard_install 
@@ -18,37 +10,29 @@ install_docs:
 -	$(INSTTOOL) -m 755 bin/doxygen    $(INSTALL)/bin
 -	$(INSTTOOL) -m 755 bin/doxytag    $(INSTALL)/bin
 -	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
--	cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxygen.1 ; \
--	cat doc/doxytag.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxytag.1 ; \
--	cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxywizard.1 ;
 +	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL)/bin
 +	$(BSD_INSTALL_PROGRAM) bin/doxygen ${DESTDIR}$(INSTALL)/bin
 +	$(BSD_INSTALL_PROGRAM) bin/doxytag ${DESTDIR}$(INSTALL)/bin
 +	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(INSTALL)/$(MAN1DIR)
-+	cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxygen.1
-+	cat doc/doxytag.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxytag.1
-+	cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxywizard.1
+ 	cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1 
+-	$(INSTTOOL) -m 644 doxygen.1 $(INSTALL)/$(MAN1DIR)/doxygen.1
++	$(BSD_INSTALL_MAN) doxygen.1 ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxygen.1
+ 	rm doxygen.1
+ 	cat doc/doxytag.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1
+-	$(INSTTOOL) -m 644 doxytag.1 $(INSTALL)/$(MAN1DIR)/doxytag.1
++	$(BSD_INSTALL_MAN) doxytag.1 ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxytag.1
+ 	rm doxytag.1
  
  install_docs: 
 -	$(INSTTOOL) -d $(DOCDIR)
--	cp -r doc $(DOCDIR)
--	cp -r examples $(DOCDIR)
--	echo "DOXYGEN  = $(INSTALL)" >  $(DOCDIR)/doc/Makefile
--	echo "DOXYDOCS = .."         >> $(DOCDIR)/doc/Makefile
--	echo "VERSION  = $(VERSION)" >> $(DOCDIR)/doc/Makefile
--	echo "PERL     = $(PERL)"    >> $(DOCDIR)/doc/Makefile
--	cat doc/Makefile.in          >> $(DOCDIR)/doc/Makefile
--	cd $(DOCDIR)/examples ; $(MAKE)
--	cd $(DOCDIR)/doc ; $(MAKE)
--	rm -rf $(DOCDIR)/doc
--	cd $(DOCDIR)/latex ; $(MAKE)
--	cp $(DOCDIR)/latex/doxygen_manual.pdf $(DOCDIR)
--	rm -rf $(DOCDIR)/latex
 +	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)
-+	$(MAKE) -C examples
-+	$(MAKE) -C doc 
-+	$(MAKE) -C latex 
-+	cp latex/doxygen_manual.pdf ${DESTDIR}$(DOCDIR)
+ 	$(MAKE) -C examples
+ 	$(MAKE) -C doc 
+ 	$(MAKE) -C latex 
+-	$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DOCDIR)
+-	cp -r examples $(DOCDIR)
+-	cp -r html $(DOCDIR)
++	$(BSD_INSTALL_DATA) latex/doxygen_manual.pdf ${DESTDIR}$(DOCDIR)
 +	cp -r examples ${DESTDIR}$(DOCDIR)
 +	cp -r html ${DESTDIR}$(DOCDIR)
  
diff --git a/devel/doxygen/patches/patch-ad b/devel/doxygen/patches/patch-ad
new file mode 100644
index 00000000000..69a6f7fa6be
--- /dev/null
+++ b/devel/doxygen/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.5 2008/06/04 15:05:39 dsainty Exp $
+
+The cast breaks compilation on NetBSD, as iconv() expects const char**.
+
+--- src/portable.cpp.orig	2008-01-01 23:41:08.000000000 +1300
++++ src/portable.cpp	2008-06-05 02:06:00.000000000 +1200
+@@ -382,7 +382,7 @@
+ // avoid a compile error, that is were the CASTNEEDED is for.
+ #if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && \
+       !((defined(_OS_MAC_) || defined(Q_OS_MACX) )&& (_LIBICONV_VERSION==0x010B))) \
+-    || defined(_OS_SOLARIS_))
++    || defined(_OS_SOLARIS_) || defined(_OS_NETBSD_))
+ #define CASTNEEDED(x) (x)
+ #else
+ #define CASTNEEDED(x) (char **)(x)
diff --git a/devel/doxygen/patches/patch-ai b/devel/doxygen/patches/patch-ai
deleted file mode 100644
index 82817781f92..00000000000
--- a/devel/doxygen/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/10/29 07:51:28 dsainty Exp $
-
-Under Solaris, PWD is more likely to be set to the working directory of the
-Pkgsrc "make" than the working directory, because Solaris /bin/sh does not
-support PWD.  An empty PWD will also fail, because configure's "test -z $PWD"
-will error if PWD is unset (PWD should be quoted).
-
-http://bugzilla.gnome.org/show_bug.cgi?id=366113
-
---- configure.old	2006-10-17 16:40:42.000000000 -0400
-+++ configure	2006-10-29 00:59:57.000000000 -0400
-@@ -432,15 +432,13 @@
- test -f .makeconfig && rm .makeconfig
- test -f .tmakeconfig && rm .tmakeconfig
- 
--if test -z $PWD; then
--  PWD=`pwd`
--fi
-+configPWD=`pwd`
- 
- cat > .makeconfig <<EOF
--DOXYGEN   = $PWD
--TMAKEPATH = $PWD/tmake/lib/$f_platform
-+DOXYGEN   = $configPWD
-+TMAKEPATH = $configPWD/tmake/lib/$f_platform
- ENV       = env TMAKEPATH=\$(TMAKEPATH)
--TMAKE     = $PWD/tmake/bin/tmake
-+TMAKE     = $configPWD/tmake/bin/tmake
- MAKE      = $f_make
- PERL      = $f_perl
- RM        = rm -f