Upgrade from 1.4.6 to 1.4.7. LIB_DEPEND on png and use the standard -lmd

instead of building our own versions.

The bundled qtools/ can be removed too, but that will make the port
always depend on Qt (hence X11), which it currently avoids.

Approved by:	maintainer timeout (13 days)

9 files changed, 229 insertions, 130 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 577ae2a76aca..a6fbbe9465c5 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	doxygen
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.7
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 EXTRACT_SUFX=	.src.tar.gz
@@ -14,8 +14,15 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	portmaint@melvyn.homeunix.org
 COMMENT=	A documentation system for C and C++
 
+BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
+LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
+
 ALL_TARGET=	all
 
+EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude '*/libmd5'	\
+	--exclude '*/libpng' --exclude '*/tmake'
+
+CONFIGURE_ENV+=	CXX="${CXX}"
 .if !defined(NOPORTDOCS)
 ALL_TARGET+=	docs
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python # XXX: Replace with USE_PYTHON_BUILD
@@ -64,23 +71,11 @@ CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \
 CONFIGURE_ARGS+=	--enable-langs no
 .endif
 
-pre-configure:
-	@${REINPLACE_CMD} -e "s:gcc:${CC}:g;	\
-		s:g\+\+:${CXX}:g;		\
-		s:%%LIBQT%%:-l${QTNAME}:g;	\
-		s:%%MOC%%:${MOC}:g;		\
-		s:%%QT_INC%%:${QT_INC}:g;	\
-		s:%%QT_LIB%%:${X11BASE}/lib:g;	\
-		s:%%QT_OPENGL%%:${QT_OPENGL}:g;	\
-		s:%%THREADLIBS%%:${THREADLIBS}:g;\
-		s:%%CFLAGS%%:${CFLAGS}:g;	\
-		s:%%CXXFLAGS%%:${CXXFLAGS}:g"	\
-	    ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
-		${WRKSRC}/libpng/pngconf.h \
-		${WRKSRC}/libpng/zutil.h ${WRKSRC}/src/pngenc.cpp
+post-configure:
+	@${REINPLACE_CMD} -e 's|TMAKE *=.*|TMAKE=/opt/bin/tmake|' \
+		-e 's|TMAKEPATH *=.*|TMAKEPATH=/opt/share/tmake/freebsd-g++|' \
+			${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \
+			${WRKSRC}/addon/doxywizard/Makefile
 
 post-build:
 	cd ${BUILD_WRKSRC}/examples; \
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 4565a9360ec2..1e7ff26e4421 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,3 +1,3 @@
-MD5 (doxygen-1.4.6.src.tar.gz) = ebf11130bec7987e9b69b1e0301d151a
-SHA256 (doxygen-1.4.6.src.tar.gz) = 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c
-SIZE (doxygen-1.4.6.src.tar.gz) = 2889072
+MD5 (doxygen-1.4.7.src.tar.gz) = 11db63a72bd3b510fd2fa7ae48086979
+SHA256 (doxygen-1.4.7.src.tar.gz) = 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
+SIZE (doxygen-1.4.7.src.tar.gz) = 2928354
diff --git a/devel/doxygen/files/patch-af b/devel/doxygen/files/patch-af
deleted file mode 100644
index a3597bc9dbd5..000000000000
--- a/devel/doxygen/files/patch-af
+++ /dev/null
@@ -1,62 +0,0 @@
---- tmake/lib/freebsd-g++/tmake.conf.orig	Sun Jun 20 18:50:17 2004
-+++ tmake/lib/freebsd-g++/tmake.conf	Tue Feb  8 21:16:01 2005
-@@ -8,16 +8,16 @@
- CONFIG			= qt warn_on release
- 
- TMAKE_CC		= gcc
--TMAKE_CFLAGS		= -pipe
-+TMAKE_CFLAGS		= %%CFLAGS%%
- TMAKE_CFLAGS_WARN_ON	= -Wall -W
- TMAKE_CFLAGS_WARN_OFF	=
--TMAKE_CFLAGS_RELEASE	= -O2
--TMAKE_CFLAGS_DEBUG	= -g
-+TMAKE_CFLAGS_RELEASE	=
-+TMAKE_CFLAGS_DEBUG	=
- TMAKE_CFLAGS_SHLIB	= -fPIC
- TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
- 
- TMAKE_CXX		= g++
--TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS		= %%CXXFLAGS%%
- TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
- TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
- TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-@@ -27,12 +27,12 @@
- 
- TMAKE_INCDIR		=
- TMAKE_LIBDIR		=
--TMAKE_INCDIR_X11	= /usr/X11R6/include
--TMAKE_LIBDIR_X11	= /usr/X11R6/lib
--TMAKE_INCDIR_QT		= $(QTDIR)/include
--TMAKE_LIBDIR_QT		= $(QTDIR)/lib
--TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
--TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+TMAKE_INCDIR_X11       = $(X11BASE)/include
-+TMAKE_LIBDIR_X11       = $(X11BASE)/lib
-+TMAKE_INCDIR_QT                = %%QT_INC%%
-+TMAKE_LIBDIR_QT                = %%QT_LIB%%
-+TMAKE_INCDIR_OPENGL    = $(X11BASE)/include
-+TMAKE_LIBDIR_OPENGL    = $(X11BASE)/lib
- 
- TMAKE_LINK		= g++
- TMAKE_LINK_SHLIB	= g++
-@@ -44,14 +44,14 @@
- # soname does not work on fbsd 2.x
- #TMAKE_LFLAGS_SONAME	= -Wl,-soname
- 
--TMAKE_LIBS		=
-+TMAKE_LIBS		= -pthread
- TMAKE_LIBS_X11		= -lXext -lX11 -lm
--TMAKE_LIBS_QT		= -lqt
--TMAKE_LIBS_QT_MT	= -lqt-mt
--TMAKE_LIBS_QT_OPENGL	= -lqgl
-+TMAKE_LIBS_QT		= %%LIBQT%%
-+TMAKE_LIBS_QT_MT	= %%LIBQT%%
-+TMAKE_LIBS_QT_OPENGL	= %%QT_OPENGL%%
- TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
- 
--TMAKE_MOC		= moc
-+TMAKE_MOC		= %%MOC%%
- 
- TMAKE_AR		= ar cqs
- TMAKE_RANLIB		=
diff --git a/devel/doxygen/files/patch-configure b/devel/doxygen/files/patch-configure
index ebdac9e8cbab..6a721452d144 100644
--- a/devel/doxygen/files/patch-configure
+++ b/devel/doxygen/files/patch-configure
@@ -1,8 +1,26 @@
---- configure.orig	Tue Feb  8 21:07:17 2005
-+++ configure	Tue Feb  8 21:07:22 2005
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- #
- # $Id: configure,v 1.9 2001/03/19 19:27:34 root Exp $
- #
+--- configure	Sat Jun 10 15:25:54 2006
++++ configure	Sun Jun 11 20:21:07 2006
+@@ -522,5 +522,5 @@
+ fi
+ 
+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in"
++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in"
+ 
+ for i in $f_inmakefiles ; do
+@@ -538,7 +538,5 @@
+        echo "" >> $DST
+        echo "all: src/version.cpp " >> $DST
+-       echo "	\$(MAKE) -C qtools" >> $DST
++       echo "	\$(MAKE) -j2 -C qtools" >> $DST
+-       echo "	\$(MAKE) -C libpng" >> $DST
+-       echo "	\$(MAKE) -C libmd5" >> $DST
+-       echo "	\$(MAKE) -C src" >> $DST
++       echo "	\$(MAKE) -j2 -C src" >> $DST
+        if test $f_wizard = YES; then
+@@ -556,5 +553,5 @@
+ done
+ 
+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" 
++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in" 
+ 
+ for i in $f_inprofiles ; do
diff --git a/devel/doxygen/files/patch-doc-Makefile.latex b/devel/doxygen/files/patch-doc-Makefile.latex
index 17a65aa2c05e..ffecc2c2bb37 100644
--- a/devel/doxygen/files/patch-doc-Makefile.latex
+++ b/devel/doxygen/files/patch-doc-Makefile.latex
@@ -1,28 +1,11 @@
---- doc/Makefile.latex.orig	Thu Jun 20 14:06:16 2002
-+++ doc/Makefile.latex	Tue Oct 15 16:50:30 2002
-@@ -12,20 +12,31 @@
- # Documents produced by Doxygen are derivative works derived from the
+--- doc/Makefile.latex	Sun May  7 14:06:16 2006
++++ doc/Makefile.latex	Sun Jun 11 20:27:05 2006
+@@ -13,13 +13,27 @@
  # input used in their production; they are not affected by this license.
  
 -all: doxygen_manual.pdf
 +all: doxygen_manual.pdf doxygen_manual.ps
  
- #doxygen_manual.pdf: doxygen_manual.ps
- #	ps2pdf doxygen_manual.ps doxygen_manual.pdf
- 
--#doxygen_manual.ps: doxygen_manual.dvi
--#	dvips -o doxygen_manual.ps doxygen_manual.dvi
-+graphics:
-+	cp ../doc/doxygen_logo.eps .
-+	cp ../doc/doxygen_logo.gif .
-+
-+doxygen_manual.dvi: doxygen_manual.pdf graphics
-+	@echo "Running latex again to get a .dvi file..."
-+	latex doxygen_manual.tex
-+
-+doxygen_manual.ps: doxygen_manual.dvi
-+	dvips -o doxygen_manual.ps doxygen_manual.dvi
- 
  doxygen_manual.pdf: doxygen_manual.tex doxygen.sty
 -	echo "Running latex..."
 +	@echo "Running latex..."
@@ -34,7 +17,18 @@
 +	@echo "Rerunning latex...."
  	pdflatex doxygen_manual.tex
 +
++graphics:
++	ln -s ../doc/doxygen_logo.eps .
++	ln -s ../doc/doxygen_logo.gif .
++
++doxygen_manual.dvi: doxygen_manual.pdf graphics
++	@echo "Running latex again to get a .dvi file..."
++	latex doxygen_manual.tex
++
++doxygen_manual.ps: doxygen_manual.dvi
++	dvips -o doxygen_manual.ps doxygen_manual.dvi
++
  clean:
  	rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log doxygen_manual.pdf
 +
-+.PHONY:	graphics
++.PHONY:        graphics
diff --git a/devel/doxygen/files/patch-md5 b/devel/doxygen/files/patch-md5
new file mode 100644
index 000000000000..9b75e081c528
--- /dev/null
+++ b/devel/doxygen/files/patch-md5
@@ -0,0 +1,132 @@
+Every other package these days seems to come with its own MD5
+implementation. Try to trim this insanity, where we can...
+
+	-mi
+
+--- src/dirdef.cpp	Sun May  7 14:02:30 2006
++++ src/dirdef.cpp	Wed Jun 14 01:30:20 2006
+@@ -1,2 +1,3 @@
++#include <sys/types.h>
+ #include <md5.h>
+ 
+@@ -74,8 +75,6 @@
+ 
+   // convert to md5 hash
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.data());
+   return sigStr;
+ 
+--- src/dot.cpp	Sun May  7 14:02:30 2006
++++ src/dot.cpp	Wed Jun 14 01:32:54 2006
+@@ -33,4 +33,5 @@
+ #include <qfile.h>
+ #include <qtextstream.h>
++#include <sys/types.h>
+ #include <md5.h>
+ 
+@@ -1089,8 +1090,6 @@
+     }
+     resetReNumbering();
+-    uchar md5_sig[16];
+     QCString sigStr(33);
+-    MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig);
+-    MD5SigToString(md5_sig,sigStr.data(),33);
++    MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data());
+     if (checkAndUpdateMd5Signature(baseName,sigStr) || 
+         !QFileInfo(mapName).exists())
+@@ -1643,8 +1642,6 @@
+     }
+   }
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)buf.ascii(),buf.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)buf.ascii(),buf.length(),sigStr.data());
+   if (reNumber)
+   {
+--- src/memberdef.cpp	Sat Jun 10 12:56:24 2006
++++ src/memberdef.cpp	Wed Jun 14 01:47:53 2006
+@@ -18,4 +18,5 @@
+ #include <stdio.h>
+ #include <qregexp.h>
++#include <sys/types.h>
+ #include <md5.h>
+ #include "memberdef.h"
+@@ -2134,8 +2135,6 @@
+   
+   // convert to md5 hash
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data());
+   anc = sigStr;
+ }
+--- src/util.cpp	Sun May  7 14:02:32 2006
++++ src/util.cpp	Wed Jun 14 02:05:03 2006
+@@ -22,4 +22,5 @@
+ #endif
+ 
++#include <sys/types.h>
+ #include <md5.h>
+ 
+@@ -4319,5 +4320,5 @@
+     if (value==0)
+     {
+-      usedNames.insert(name,(void *)count);
++      usedNames.insert(name,(void *)(intptr_t)count);
+       num = count++;
+     }
+@@ -4335,8 +4336,6 @@
+     {
+       // third algorithm based on MD5 hash
+-      uchar md5_sig[16];
+       QCString sigStr(33);
+-      MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
+-      MD5SigToString(md5_sig,sigStr.data(),33);
++      MD5Data((const unsigned char *)result.data(),resultLen,sigStr.data());
+       result=result.left(128-32)+sigStr; 
+     }
+@@ -4344,5 +4343,7 @@
+   if (createSubdirs)
+   {
++#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
+     int l1Dir=0,l2Dir=0;
++#endif
+ 
+ #if MAP_ALGO==ALGO_COUNT 
+@@ -4375,10 +4376,11 @@
+ #elif MAP_ALGO==ALGO_MD5
+     // third algorithm based on MD5 hash
+-    uchar md5_sig[16];
+-    MD5Buffer((const unsigned char *)result.data(),result.length(),md5_sig);
+-    l1Dir = md5_sig[14]&0xf;
+-    l2Dir = md5_sig[15];
++    char md5[33];
++    MD5Data((const unsigned char *)result.data(),result.length(),md5);
++    result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31]));
+ #endif
++#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
+     result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir));
++#endif
+   }
+   return result;
+--- src/doxygen.pro.in	Sun May  7 14:02:30 2006
++++ src/doxygen.pro.in	Wed Jun 14 02:08:53 2006
+@@ -19,5 +19,5 @@
+ HEADERS      =	doxygen.h 
+ SOURCES      =	main.cpp 
+-unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
++unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd
+ win32:INCLUDEPATH          += .
+ win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
+@@ -29,5 +29,5 @@
+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+-INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
++INCLUDEPATH                += ../qtools .
+ #win32-g++:INCLUDEPATH      -= ../libpng
+ DESTDIR                    =  ../bin
diff --git a/devel/doxygen/files/patch-png b/devel/doxygen/files/patch-png
new file mode 100644
index 000000000000..d3dee411f897
--- /dev/null
+++ b/devel/doxygen/files/patch-png
@@ -0,0 +1,25 @@
+Use the standard png-library instead of rolling our own.
+
+	-mi
+
+--- src/pngenc.cpp	Sun May  7 14:02:31 2006
++++ src/pngenc.cpp	Wed Jun 14 01:50:19 2006
+@@ -21,10 +21,5 @@
+  */
+ 
+-#ifndef png_jmpbuf
+-#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+-#endif
+-
+-#define ALL_STATIC
+-#include <../libpng/png.h>
++#include <png.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -33,6 +28,4 @@
+ #include "pngenc.h"
+ #include "message.h"
+-
+-#undef jmpbuf
+ 
+ static void user_error_fn(png_structp, png_const_charp error_msg)
diff --git a/devel/doxygen/files/patch-warnings b/devel/doxygen/files/patch-warnings
new file mode 100644
index 000000000000..b2e50c9e729b
--- /dev/null
+++ b/devel/doxygen/files/patch-warnings
@@ -0,0 +1,15 @@
+--- qtools/qgdict.cpp	Wed Apr 13 15:51:44 2005
++++ qtools/qgdict.cpp	Wed Jun 14 01:43:49 2006
+@@ -41,4 +41,5 @@
+ #include "qdatastream.h"
+ #include <ctype.h>
++#include <sys/types.h>
+ 
+ // NOT REVISED
+@@ -1005,5 +1006,5 @@
+ 	    case PtrKey:
+ 		{
+-		    Q_UINT32 k;
++		    uintptr_t k;
+ 		    s >> k;
+ 		    read( s, d );
diff --git a/devel/doxygen/pkg-plist b/devel/doxygen/pkg-plist
index b2e974b57730..495f2ff31833 100644
--- a/devel/doxygen/pkg-plist
+++ b/devel/doxygen/pkg-plist
@@ -20,7 +20,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/afterdoc/html/tab_l.gif
@@ -33,7 +32,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/author/html/class_windows_n_t.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/author/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/examples/author/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/examples/author/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/author/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/author/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/author/html/tab_b.gif
@@ -60,7 +58,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/globals_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/globals_type.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/globals_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/autolink/html/tab_l.gif
@@ -74,7 +71,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/class/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/examples/class/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/examples/class/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/class/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/class/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/class/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/class/html/tab_l.gif
@@ -162,7 +158,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/docstring/html/tab_l.gif
@@ -180,7 +175,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/functions_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/functions_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/enum/html/tab_l.gif
@@ -198,7 +192,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/example/html/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/example/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/example/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/example/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/example/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/example/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/example/html/tab_l.gif
@@ -230,7 +223,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/func/html/func_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/func/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/func/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/func/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/func/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/func/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/func/html/tab_l.gif
@@ -255,7 +247,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/group/html/group__group3.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/group/html/group__group4.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/group/html/group__group5.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/group/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/group/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/group/html/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/group/html/namespace_n1.html
@@ -274,7 +265,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/include/html/example.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/include/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/include/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/include/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/include/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/include/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/include/html/tab_b.gif
@@ -293,7 +283,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/jdstyle/html/tab_l.gif
@@ -312,7 +301,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/memgrp_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/memgrp/html/tab_b.gif
@@ -328,7 +316,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/overload/html/tab_l.gif
@@ -352,7 +339,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/par/html/class_test.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/par/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/examples/par/html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/examples/par/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/par/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/par/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/par/html/tab_l.gif
@@ -368,7 +354,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/pyexample/html/tab_l.gif
@@ -386,7 +371,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/qtstyle/html/tab_l.gif
@@ -402,7 +386,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/functions_rela.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/examples/relates/html/tab_l.gif
@@ -419,7 +402,6 @@ bin/doxytag
 %%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/globals_func.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/globals_type.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/restypedef_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/restypedef/html/struct_coord_struct-members.html