updated with patch from bug #210237 and added latest release

(Portage version: 2.1.4.1)

10 files changed, 326 insertions, 13 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index b9a4040bc823..48db95ae95ac 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.141 2008/01/24 20:30:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.142 2008/02/16 20:24:36 nerdboy Exp $
+
+*doxygen-1.5.5 (16 Feb 2008)
+
+  16 Feb 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/doxygen-1.5-qtlibdir.patch, +files/doxygen-1.5-system-libpng.patch,
+  doxygen-1.5.2.ebuild, doxygen-1.5.3.ebuild, doxygen-1.5.4.ebuild,
+  +doxygen-1.5.5.ebuild:
+  Updated with patch from bug #210237 and added latest release.  Fixed
+  broken config with hack for lib64 path for QT and back-ported patches
+  to several previous versions (tested on both 32 and 64-bit machines).
+  Closes bugs #209977 and #210237.
 
   24 Jan 2008; Christoph Mende <angelos@gentoo.org> doxygen-1.5.4.ebuild:
   Stable on amd64, bug #203652
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
index 127297a1fe85..097790f199e2 100644
--- a/app-doc/doxygen/doxygen-1.4.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.23 2008/02/04 18:39:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.24 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index 77e864fdcecf..c004b4a72c5b 100644
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.13 2008/02/04 18:39:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.14 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
index 70b82e76ce74..263895e67397 100644
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.14 2007/11/21 06:17:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.15 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C,
+DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Obj-C,
 	Python, IDL , and other C-like languages."
 HOMEPAGE="http://www.doxygen.org/"
 SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
diff --git a/app-doc/doxygen/doxygen-1.5.2.ebuild b/app-doc/doxygen/doxygen-1.5.2.ebuild
index 7dc1c0603771..06488bebbaca 100644
--- a/app-doc/doxygen/doxygen-1.5.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.2.ebuild,v 1.10 2007/11/21 06:17:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.2.ebuild,v 1.11 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3
 
@@ -36,6 +36,13 @@ src_unpack() {
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
 	if is-flagq "-O3" ; then
 	    echo
 	    ewarn "Compiling with -O3 is known to produce incorrectly"
diff --git a/app-doc/doxygen/doxygen-1.5.3.ebuild b/app-doc/doxygen/doxygen-1.5.3.ebuild
index 0d0560569f6e..a370e3ca4410 100644
--- a/app-doc/doxygen/doxygen-1.5.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.3.ebuild,v 1.4 2007/11/21 06:17:24 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.3.ebuild,v 1.5 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
 
@@ -44,6 +44,13 @@ src_unpack() {
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
 	if is-flagq "-O3" ; then
 	    echo
 	    ewarn "Compiling with -O3 is known to produce incorrectly"
diff --git a/app-doc/doxygen/doxygen-1.5.4.ebuild b/app-doc/doxygen/doxygen-1.5.4.ebuild
index 34a08d1f3d18..acb7e8d3a9a8 100644
--- a/app-doc/doxygen/doxygen-1.5.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.10 2008/01/24 20:30:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.11 2008/02/16 20:24:36 nerdboy Exp $
 
 inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
 
@@ -47,6 +47,13 @@ src_unpack() {
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
 
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
 	if is-flagq "-O3" ; then
 	    echo
 	    ewarn "Compiling with -O3 is known to produce incorrectly"
diff --git a/app-doc/doxygen/doxygen-1.5.5.ebuild b/app-doc/doxygen/doxygen-1.5.5.ebuild
new file mode 100644
index 000000000000..98f2bd423820
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.5.5.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v 1.1 2008/02/16 20:24:36 nerdboy Exp $
+
+inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
+
+DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc nodot qt3 tetex elibc_FreeBSD"
+
+RDEPEND="qt3? ( $(qt_min_version 3.3) )
+	tetex? ( virtual/tetex )
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
+	virtual/ghostscript
+	!nodot? ( >=media-gfx/graphviz-2.6
+		media-libs/freetype )"
+DEPEND=">=sys-apps/sed-4
+	${RDEPEND}"
+
+EPATCH_SUFFIX="patch"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# use CFLAGS, CXXFLAGS, LDFLAGS
+	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
+	    -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
+	    -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
+	    tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
+	    || die "sed failed"
+
+	# Ensure we link to -liconv
+	if use elibc_FreeBSD; then
+	    for pro in */*.pro.in */*/*.pro.in; do
+		echo "unix:LIBS += -liconv" >> "${pro}"
+	    done
+	fi
+
+	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
+	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
+	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
+
+	# remove internal libpng - see bug #210237
+	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+
+	if [ $(get_libdir) == "lib64" ] ; then
+	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+	fi
+
+	if is-flagq "-O3" ; then
+	    echo
+	    ewarn "Compiling with -O3 is known to produce incorrectly"
+	    ewarn "optimized code which breaks doxygen."
+	    echo
+	    epause 6
+	    elog "Continuing with -O2 instead ..."
+	    echo
+	    replace-flags "-O3" "-O2"
+	fi
+}
+
+src_compile() {
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+	# set ./configure options (prefix, Qt based wizard, docdir)
+
+	local my_conf=""
+	if use debug; then
+	    my_conf="--prefix ${D}usr --debug"
+	else
+	    my_conf="--prefix ${D}usr"
+	fi
+
+	if use qt3; then
+	    einfo "using QTDIR: '$QTDIR'."
+	    export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
+	    export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
+	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+	    ./configure ${my_conf} $(use_with qt3 doxywizard) \
+		|| die 'configure with qt3 failed'
+	else
+	    ./configure ${my_conf} || die 'configure failed'
+	fi
+
+	# and compile
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
+	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
+
+	# generate html and pdf (if tetex in use) documents.
+	# errors here are not considered fatal, hence the ewarn message
+	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
+	# so we allow it.
+	if use doc; then
+	    if use nodot; then
+		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+		    {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
+	    fi
+	    if use tetex; then
+		addwrite /var/cache/fonts
+		addwrite /usr/share/texmf/fonts/pk
+		addwrite /usr/share/texmf/ls-R
+		make pdf || ewarn '"make pdf docs" failed.'
+	    else
+		cp doc/Doxyfile doc/Doxyfile.orig
+		cp doc/Makefile doc/Makefile.orig
+		sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
+		    doc/Doxyfile
+		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+		    -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+		    -e "s/@sed/# @sed/" doc/Makefile
+		make docs || ewarn '"make html docs" failed.'
+	    fi
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
+		install || die '"make install" failed.'
+
+	if use qt3; then
+	    doicon "${FILESDIR}/doxywizard.png"
+	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+		"doxywizard.png" "Application;Development"
+	fi
+
+	dodoc INSTALL LANGUAGE.HOWTO README
+
+	# pdf and html manuals
+	if use doc; then
+	    insinto /usr/share/doc/"${PF}"
+	    if use tetex; then
+		doins latex/doxygen_manual.pdf
+	    fi
+	    dohtml -r html/*
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	elog "the html and pdf documentation, respectively.  For examples"
+	elog "and other goodies, see the source tarball.  For some example"
+	elog "output, run doxygen on the doxygen source using the Doxyfile"
+	elog "provided in the top-level source dir."
+	elog
+	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
+	elog "along with Doxygen's ability to generate diagrams in the docs."
+	elog "See the Doxygen homepage for additional helper tools to parse"
+	elog "more languages."
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch
new file mode 100644
index 000000000000..34aaef42d2dd
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2008-02-15 18:40:57.000000000 -0800
++++ configure	2008-02-15 19:06:13.000000000 -0800
+@@ -276,6 +276,8 @@
+         echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!"
+         exit 2
+       fi
++    fi
++    if test -d "$QTDIR/lib64"; then
+       LIBDIR=lib64
+     fi
+     if test ! -d "$QTDIR/include"; then
diff --git a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch
new file mode 100644
index 000000000000..dbd95b879ba4
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch
@@ -0,0 +1,105 @@
+diff -ur doxygen-1.5.1/configure doxygen-fixed/configure
+--- doxygen-1.5.1/configure	2006-11-01 22:52:27.711364356 +0200
++++ doxygen-fixed/configure	2006-11-01 22:54:09.086952924 +0200
+@@ -525,7 +525,7 @@
+ EOF
+ 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 addon/doxyapp/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 libmd5/Makefile.in addon/doxyapp/Makefile.in"
+ 
+ for i in $f_inmakefiles ; do
+      SRC=$i
+@@ -542,7 +542,6 @@
+        echo "" >> $DST
+        echo "all: src/version.cpp " >> $DST
+        echo "	\$(MAKE) -C qtools" >> $DST
+-       echo "	\$(MAKE) -C libpng" >> $DST
+        echo "	\$(MAKE) -C libmd5" >> $DST
+        echo "	\$(MAKE) -C src" >> $DST
+        if test $f_wizard = YES; then
+@@ -562,7 +561,7 @@
+      echo "  Created $DST from $SRC..."
+ 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 addon/doxyapp/doxyapp.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 libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" 
+ 
+ for i in $f_inprofiles ; do
+      SRC=$i
+diff -ur doxygen-1.5.1/Makefile.in doxygen-fixed/Makefile.in
+--- doxygen-1.5.1/Makefile.in	2006-11-01 22:52:31.257825212 +0200
++++ doxygen-fixed/Makefile.in	2006-11-01 22:53:44.182738940 +0200
+@@ -7,7 +7,6 @@
+ 	cd doc ; $(MAKE) clean
+ 	cd qtools ; $(MAKE) clean
+ 	cd src ; $(MAKE) clean
+-	cd libpng ; $(MAKE) clean
+ 	cd libmd5 ; $(MAKE) clean
+ 	cd addon/doxywizard ; $(MAKE) clean
+ 	cd addon/doxmlparser/src ; $(MAKE) clean
+@@ -18,7 +17,6 @@
+ 
+ distclean: clean
+ 	cd src ; $(MAKE) distclean
+-	cd libpng ; $(MAKE) distclean
+ 	cd libmd5 ; $(MAKE) distclean
+ 	cd addon/doxywizard ; $(MAKE) distclean
+ 	cd addon/doxmlparser/src ; $(MAKE) distclean
+@@ -32,11 +30,10 @@
+ 	-rm -f objects/*.o
+ 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
+ 	-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
+-	-rm -f libpng/Makefile.libpng
+ 	-rm -f libmd5/Makefile.libmd5
+ 	-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
+ 	-rm -f .makeconfig .tmakeconfig
+-	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
++	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
+ 	-rm -f src/version.cpp
+ 	-rm -r addon/doxywizard/Makefile
+ 	-rm -f addon/doxywizard/Makefile.doxywizard
+@@ -81,7 +78,7 @@
+ pdf: docs
+ 	cd latex ; $(MAKE)
+ 
+-DISTFILES =  Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \
++DISTFILES =  Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \
+              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
+              Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
+              VERSION packages winbuild
+diff -ur doxygen-1.5.1/src/doxygen.pro.in doxygen-fixed/src/doxygen.pro.in
+--- doxygen-1.5.1/src/doxygen.pro.in	2006-11-01 22:52:32.611619404 +0200
++++ doxygen-fixed/src/doxygen.pro.in	2006-11-01 22:54:39.508328172 +0200
+@@ -28,7 +28,7 @@
+ win32:TMAKE_CXXFLAGS       += -DQT_NODLL
+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+-INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
++INCLUDEPATH                += ../qtools ../libmd5 .
+ #win32-g++:INCLUDEPATH      -= ../libpng
+ DESTDIR                    =  ../bin
+ TARGET                     =  doxygen
+diff -ur doxygen-1.5.1/src/libdoxygen.pro.in doxygen-fixed/src/libdoxygen.pro.in
+--- doxygen-1.5.1/src/libdoxygen.pro.in	2006-11-01 22:52:33.704453268 +0200
++++ doxygen-fixed/src/libdoxygen.pro.in	2006-11-01 22:54:50.479660276 +0200
+@@ -207,7 +207,6 @@
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+ linux-g++:TMAKE_CXXFLAGS    += -fno-exceptions -fno-rtti
+ INCLUDEPATH                += ../qtools
+-INCLUDEPATH                += ../libpng
+ INCLUDEPATH                += ../libmd5
+ win32:INCLUDEPATH          += .
+ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
+diff -ur doxygen-1.5.1/src/pngenc.cpp doxygen-fixed/src/pngenc.cpp
+--- doxygen-1.5.1/src/pngenc.cpp	2006-11-01 22:52:34.006407364 +0200
++++ doxygen-fixed/src/pngenc.cpp	2006-11-01 22:53:13.023475868 +0200
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #define ALL_STATIC
+-#include <../libpng/png.h>
++#include <png.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>