diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 55cdb5a3ee19..7948f1732604 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jackit
 PORTVERSION=	0.121.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://jackaudio.org/downloads/
 DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
@@ -11,6 +11,9 @@ DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Low latency audio server
 
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+
 LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
@@ -24,6 +27,7 @@ CONFIGURE_ARGS=	--enable-portaudio \
 		--with-default-tmpdir=/tmp
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 LATEST_LINK=	jack
 
diff --git a/audio/jack/pkg-plist b/audio/jack/pkg-plist
index afbbc5179c71..1f34c7bd7e3e 100644
--- a/audio/jack/pkg-plist
+++ b/audio/jack/pkg-plist
@@ -86,14 +86,14 @@ man/man1/jackstart.1.gz
 %%DOCS%%share/jack-audio-connection-kit/reference/html/functions.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/globals.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x65.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x69.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6a.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6d.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x6f.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x70.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x74.html
-%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_0x77.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_e.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_i.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_j.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_m.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_o.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_p.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_t.html
+%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_w.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html
 %%DOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile
index 99aa1dbbe39a..af8a86e0f3fa 100644
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmpdclient
 PORTVERSION=	2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.musicpd.org/download/libmpdclient/2/
 
@@ -13,6 +13,7 @@ COMMENT=	API library for interfacing MPD
 GNU_CONFIGURE=	yes
 USES=		tar:xz gmake libtool pathfix
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/audio/libmpdclient/pkg-plist b/audio/libmpdclient/pkg-plist
index ba580b3fe075..15ea907e8578 100644
--- a/audio/libmpdclient/pkg-plist
+++ b/audio/libmpdclient/pkg-plist
@@ -71,7 +71,6 @@ share/vala/vapi/libmpdclient.vapi
 %%PORTDOCS%%%%DOCSDIR%%/html/error_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2cl.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2doc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderopen.png
@@ -79,9 +78,7 @@ share/vala/vapi/libmpdclient.vapi
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2link.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2mlastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2ns.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2plastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2pnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2splitbar.png
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 93419a7c9d3a..4313cba0b1b6 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openobex
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	comms net
 MASTER_SITES=	http://www.hendrik-sattler.de/downloads/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
diff --git a/comms/openobex/pkg-plist b/comms/openobex/pkg-plist
index 5c367141048a..0ad0fd2292b0 100644
--- a/comms/openobex/pkg-plist
+++ b/comms/openobex/pkg-plist
@@ -23,7 +23,6 @@ libdata/pkgconfig/openobex.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/dynsections.js
 %%DOXYGEN%%%%DOCSDIR%%/html/files.html
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2blank.png
-%%DOXYGEN%%%%DOCSDIR%%/html/ftv2cl.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2doc.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2folderclosed.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2folderopen.png
@@ -31,9 +30,7 @@ libdata/pkgconfig/openobex.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2link.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2mlastnode.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2mnode.png
-%%DOXYGEN%%%%DOCSDIR%%/html/ftv2mo.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2node.png
-%%DOXYGEN%%%%DOCSDIR%%/html/ftv2ns.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2plastnode.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2pnode.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2splitbar.png
@@ -41,10 +38,10 @@ libdata/pkgconfig/openobex.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/functions.html
 %%DOXYGEN%%%%DOCSDIR%%/html/functions_vars.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals.html
-%%DOXYGEN%%%%DOCSDIR%%/html/globals_0x66.html
-%%DOXYGEN%%%%DOCSDIR%%/html/globals_0x69.html
-%%DOXYGEN%%%%DOCSDIR%%/html/globals_0x6f.html
-%%DOXYGEN%%%%DOCSDIR%%/html/globals_0x74.html
+%%DOXYGEN%%%%DOCSDIR%%/html/globals_f.html
+%%DOXYGEN%%%%DOCSDIR%%/html/globals_i.html
+%%DOXYGEN%%%%DOCSDIR%%/html/globals_o.html
+%%DOXYGEN%%%%DOCSDIR%%/html/globals_t.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals_defs.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals_enum.html
 %%DOXYGEN%%%%DOCSDIR%%/html/globals_eval.html
diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile
index 35858e60f857..f296003bb51a 100644
--- a/comms/rtl-sdr/Makefile
+++ b/comms/rtl-sdr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rtl-sdr
 PORTVERSION=	20140210
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
@@ -25,7 +25,7 @@ DOCSDIR=	${PREFIX}/share/doc/librtlsdr
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
@@ -42,4 +42,4 @@ post-patch:
 pre-configure:
 	@(cd ${WRKSRC} && ${AUTORECONF} -fi)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/rtl-sdr/pkg-plist b/comms/rtl-sdr/pkg-plist
index caa034f22a0e..86eb175ecd21 100644
--- a/comms/rtl-sdr/pkg-plist
+++ b/comms/rtl-sdr/pkg-plist
@@ -33,7 +33,6 @@ libdata/pkgconfig/librtlsdr.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/files.js
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2cl.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2doc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderopen.png
@@ -41,9 +40,7 @@ libdata/pkgconfig/librtlsdr.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2link.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2mlastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2ns.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2plastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2pnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2splitbar.png
diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile
index 66bfc79d41e0..21d9135d868f 100644
--- a/comms/usrp/Makefile
+++ b/comms/usrp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	usrp
 PORTVERSION=	3.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	adrian
diff --git a/comms/usrp/pkg-plist b/comms/usrp/pkg-plist
index 9aaec63cf025..d11edabfbf31 100644
--- a/comms/usrp/pkg-plist
+++ b/comms/usrp/pkg-plist
@@ -234,7 +234,6 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/exception_8hpp_source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2cl.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2doc.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderopen.png
@@ -242,65 +241,63 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2link.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mlastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mo.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2ns.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2plastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2pnode.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2splitbar.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2vertline.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x7e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_e.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_f.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x77.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x78.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_0x7e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_g.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_i.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_k.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_l.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_m.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_n.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_o.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_p.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_r.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_s.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_t.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_u.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_v.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_w.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_x.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_func_~.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_g.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_h.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_i.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_k.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_l.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_m.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_n.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_o.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_p.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_r.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_s.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_t.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_type.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_u.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_v.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_w.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_x.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_~.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/gain__group_8hpp.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/gain__group_8hpp_source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals.html
@@ -362,312 +359,312 @@ libdata/pkgconfig/uhd.pc
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/safe__call_8hpp_source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/safe__main_8hpp.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/safe__main_8hpp_source.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6b.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6b.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_78.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_78.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_7a.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_7a.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_7e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_7e.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_5f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_5f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_66.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_67.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6b.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6b.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6c.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6c.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6e.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_78.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_78.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_7a.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_7a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_10.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_10.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_11.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_11.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_12.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_12.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_13.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_13.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_14.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_14.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_15.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_15.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_16.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_16.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_17.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_17.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_18.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_18.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_10.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_10.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_11.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_11.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_12.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_12.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_13.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_13.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_14.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_14.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_15.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_15.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_f.js
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/close.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_5f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_5f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_66.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6e.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_77.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_77.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6c.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6c.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_7a.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_7a.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_66.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_67.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_68.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_68.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6b.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6b.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6c.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6c.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6e.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_77.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_77.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_78.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_78.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_7e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_7e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_10.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_10.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_f.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_10.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_10.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_11.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_11.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_12.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_12.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_13.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_13.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_14.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_14.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_15.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_15.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_16.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_16.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_17.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_17.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_f.js
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/mag_sel.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/namespaces_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/namespaces_75.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/namespaces_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/namespaces_0.js
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/nomatches.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.css
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.js
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_l.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_m.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_r.png
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_66.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_67.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_68.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_68.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_5f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_5f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.js
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_0.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_0.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_1.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_1.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_10.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_10.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_11.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_11.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_12.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_12.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_13.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_13.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_2.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_2.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_3.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_3.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_4.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_4.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_5.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_5.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_7.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_7.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_8.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_8.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_9.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_9.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_a.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_a.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_b.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_b.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_c.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_c.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_d.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_d.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_e.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_e.js
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_f.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_f.js
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sensors_8hpp.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sensors_8hpp_source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/serial_8hpp.html
diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile
index 9ec92ae359e7..cf1d3394f05f 100644
--- a/databases/libdrizzle/Makefile
+++ b/databases/libdrizzle/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdrizzle
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpadlibrarian.net/41155299/ \
 		LOCAL/bdrewery/${PORTNAME}/
@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool
 CONFIGURE_ARGS+=--enable-libsqlite3
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 SAMPLE_PROGS=	client pipe_query proxy server simple \
 		simple_multi sqlite_server
diff --git a/databases/libdrizzle/pkg-plist b/databases/libdrizzle/pkg-plist
index 18c6c7cba4bb..5b1ff13386cd 100644
--- a/databases/libdrizzle/pkg-plist
+++ b/databases/libdrizzle/pkg-plist
@@ -29,9 +29,12 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/Doxyfile.api
 %%PORTDOCS%%%%DOCSDIR%%/Doxyfile.dev
 %%PORTDOCS%%%%DOCSDIR%%/api/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/bdwn.png
 %%PORTDOCS%%%%DOCSDIR%%/api/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/client_8c.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/client_8c_source.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/closed.png
 %%PORTDOCS%%%%DOCSDIR%%/api/html/column_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/column_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/column__client_8h.html
@@ -50,6 +53,9 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/api/html/conn__server_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/constants_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/constants_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/dir_49e56c817e5e54854c35e136979f97ca.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/dir_d28a4824dc47e487b107a5db32ef43c4.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/dir_e6d885289e332b589fc0bd695d13345c.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/api/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/api/html/doxygen_8h.html
@@ -60,34 +66,48 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/api/html/drizzle__client_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/drizzle__server_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/drizzle__server_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/api/html/field__client_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/field__client_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/field__server_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/field__server_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/ftv2vertline.png
 %%PORTDOCS%%%%DOCSDIR%%/api/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_c.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_d.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/globals_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/globals_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_eval_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_eval_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_eval_c.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_eval_d.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_d.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_m.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_p.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_r.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_s.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_func_u.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_m.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_p.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_r.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_s.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/globals_u.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/group__drizzle.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/group__drizzle__client.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/group__drizzle__client__interface.html
@@ -119,7 +139,12 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/api/html/handshake__server_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/handshake__server_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/api/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/api/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/open.png
 %%PORTDOCS%%%%DOCSDIR%%/api/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/pipe__query_8c.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/pipe__query_8c_source.html
@@ -148,16 +173,22 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/api/html/structclient__con__st.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/structclient__st.html
 %%PORTDOCS%%%%DOCSDIR%%/api/html/structsqlite__server.html
-%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_r.gif
+%%PORTDOCS%%%%DOCSDIR%%/api/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/api/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/api/html/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/api/html/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/api_header.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/bdwn.png
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/client_8c.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/client_8c_source.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/closed.png
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/column_8c.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/column_8c_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/column_8h.html
@@ -188,6 +219,9 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/conn__uds_8c_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/constants_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/constants_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/dir_49e56c817e5e54854c35e136979f97ca.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/dir_d28a4824dc47e487b107a5db32ef43c4.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/dir_e6d885289e332b589fc0bd695d13345c.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/doxygen_8h.html
@@ -202,6 +236,7 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/drizzle__local_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/drizzle__server_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/drizzle__server_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/field_8c.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/field_8c_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/field__client_8h.html
@@ -209,32 +244,45 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/field__server_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/field__server_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/ftv2vertline.png
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_b.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_c.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_d.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_eval_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_eval_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_eval_c.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_eval_d.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_c.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_d.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_m.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_p.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_r.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_s.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_func_u.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_l.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_m.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_p.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_r.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_s.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_u.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/globals_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/group__drizzle.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/group__drizzle__client.html
@@ -277,7 +325,12 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/handshake__server_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/handshake__server_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/open.png
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/pack_8c.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/pack_8c_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/pack_8h.html
@@ -334,9 +387,12 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/structs_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/structs_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/structsqlite__server.html
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_r.gif
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/dev/html/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/dev/html/visibility_8h.html
@@ -350,11 +406,10 @@ libdata/pkgconfig/libdrizzle.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple_multi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sqlite_server
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dev/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dev
+@dirrm include/libdrizzle
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/api/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dev/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dev
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%
-@dirrm include/libdrizzle
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 3bf6392ec43a..bef36cee9f01 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -3,16 +3,16 @@
 
 PORTNAME=	avr-libc
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C and math library for the Atmel AVR controller family
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
@@ -24,7 +24,6 @@ RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOCS}
@@ -35,7 +34,8 @@ NO_STAGE=	yes
 USE_TEX=	latex:build
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		fig2dev:${PORTSDIR}/print/transfig \
-		jpegtopnm:${PORTSDIR}/graphics/netpbm
+		jpegtopnm:${PORTSDIR}/graphics/netpbm \
+		dvips:${PORTSDIR}/print/tex-dvipsk
 .endif
 
 USES=		gettext:build tar:bzip2 gmake
@@ -57,8 +57,8 @@ PLIST_DOC=
 # Sorry, the user is no longer be able to override the optimization and
 # debugging settings now.
 MAKE_ENV=	NO_CPU_CFLAGS=true
-CFLAGS=		-O
-CXXFLAGS=	-O
+CFLAGS+=	-O
+CXXFLAGS+=	-O
 
 post-patch:
 .if ! ${PORT_OPTIONS:MDOCS}
@@ -86,10 +86,10 @@ do-install:
 	        @for file in ${PLIST_FILES}; do \
 			${ECHO_CMD} $${file} >> ${TMPPLIST}; \
 	        done
-		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} install)
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} \
-			${WRKDIR}/${DISTNAME}/AUTHORS \
-			${DOCSDIR}
+		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
+			${MAKE_CMD} ${MAKE_ARGS} install)
+		${MKDIR} ${STAGEDIR}${DOCSDIR}
+		${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AUTHORS \
+			${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/avr-libc/files/patch-doc-api-Makefile.in b/devel/avr-libc/files/patch-doc-api-Makefile.in
new file mode 100644
index 000000000000..d130e2d8ffea
--- /dev/null
+++ b/devel/avr-libc/files/patch-doc-api-Makefile.in
@@ -0,0 +1,10 @@
+--- doc/api/Makefile.in-orig	2014-06-19 19:32:10.000000000 +0200
++++ doc/api/Makefile.in	2014-06-19 19:33:18.000000000 +0200
+@@ -505,6 +505,7 @@
+ latex_src/refman.tex: doxygen.config $(IMAGE_EPS) $(IMAGE_PNG)
+ 	doxygen doxygen.config
+ 	cp $(top_srcdir)/doc/api/avrs.png-save $(AVR_LIBC_USER_MANUAL)/avrs.png
++	cd latex_src && patch < ../patch-latex-Makefile
+ 	cd latex_src && \
+ 		sed -e '/tocdepth/s/1/2/' \
+ 		-e '/usepackage{doxygen}/s/$$/\\usepackage{longtable}/' \
diff --git a/devel/avr-libc/files/patch-patch b/devel/avr-libc/files/patch-patch
new file mode 100644
index 000000000000..681d9873cab0
--- /dev/null
+++ b/devel/avr-libc/files/patch-patch
@@ -0,0 +1,28 @@
+--- doc/api/patch-latex-Makefile.orig	1970-01-01 01:00:00.000000000 +0100
++++ doc/api/patch-latex-Makefile	2014-06-19 19:30:34.000000000 +0200
+@@ -0,0 +1,25 @@
++--- Makefile.orig	2014-06-19 19:30:00.000000000 +0200
+++++ Makefile	2014-06-19 19:13:27.000000000 +0200
++@@ -3,18 +3,18 @@
++ pdf: refman.pdf
++ 
++ refman.pdf: clean refman.tex
++-	pdflatex refman
+++	-pdflatex refman
++ 	makeindex refman.idx
++-	pdflatex refman
+++	-pdflatex refman
++ 	latex_count=8 ; \
++ 	while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
++ 	    do \
++ 	      echo "Rerunning latex...." ;\
++-	      pdflatex refman ;\
+++	      pdflatex refman || exit 0 ;\
++ 	      latex_count=`expr $$latex_count - 1` ;\
++ 	    done
++ 	makeindex refman.idx
++-	pdflatex refman
+++	-pdflatex refman
++ 
++ 
++ clean:
diff --git a/devel/avr-libc/pkg-plist b/devel/avr-libc/pkg-plist
index 6152f97c761f..e18332b0f350 100644
--- a/devel/avr-libc/pkg-plist
+++ b/devel/avr-libc/pkg-plist
@@ -410,18 +410,6 @@ avr/lib/avr6/libprintf_flt.a
 avr/lib/avr6/libprintf_min.a
 avr/lib/avr6/libscanf_flt.a
 avr/lib/avr6/libscanf_min.a
-avr/lib/avrtiny10/crttn10.o
-avr/lib/avrtiny10/crttn20.o
-avr/lib/avrtiny10/crttn4.o
-avr/lib/avrtiny10/crttn40.o
-avr/lib/avrtiny10/crttn5.o
-avr/lib/avrtiny10/crttn9.o
-avr/lib/avrtiny10/libc.a
-avr/lib/avrtiny10/libm.a
-avr/lib/avrtiny10/libprintf_flt.a
-avr/lib/avrtiny10/libprintf_min.a
-avr/lib/avrtiny10/libscanf_flt.a
-avr/lib/avrtiny10/libscanf_min.a
 avr/lib/avrxmega2/crtx16a4.o
 avr/lib/avrxmega2/crtx16d4.o
 avr/lib/avrxmega2/crtx32a4.o
@@ -441,7 +429,6 @@ avr/lib/avrxmega4/libprintf_min.a
 avr/lib/avrxmega4/libscanf_flt.a
 avr/lib/avrxmega4/libscanf_min.a
 avr/lib/avrxmega5/crtx64a1.o
-avr/lib/avrxmega5/crtx64a1u.o
 avr/lib/avrxmega5/libc.a
 avr/lib/avrxmega5/libm.a
 avr/lib/avrxmega5/libprintf_flt.a
@@ -462,7 +449,6 @@ avr/lib/avrxmega6/libprintf_min.a
 avr/lib/avrxmega6/libscanf_flt.a
 avr/lib/avrxmega6/libscanf_min.a
 avr/lib/avrxmega7/crtx128a1.o
-avr/lib/avrxmega7/crtx128a1u.o
 avr/lib/avrxmega7/libc.a
 avr/lib/avrxmega7/libm.a
 avr/lib/avrxmega7/libprintf_flt.a
@@ -523,5 +509,4 @@ share/doc/avr-libc/AUTHORS
 @dirrm avr/lib/avrxmega5
 @dirrm avr/lib/avrxmega6
 @dirrm avr/lib/avrxmega7
-@dirrm avr/lib/avrtiny10
 @dirrm share/doc/avr-libc
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 881d7046a020..90df7d372686 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -3,40 +3,40 @@
 
 PORTNAME=	cppunit
 PORTVERSION=	1.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	C++ port of the JUnit framework for unit testing
 
-OPTIONS_DEFINE=	DOXYGEN DOCS
+OPTIONS_DEFINE=	DOXYGEN
 
-USES=		libtool
+USES=		libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen \
+			dot:${PORTSDIR}/graphics/graphviz
 CONFIGURE_ARGS+=	--enable-doc --enable-doxygen --enable-html-docs
-PLIST_SUB+=		HTMLDOCS="" PORTDOCS=""
+PLIST_SUB+=		PORTDOCS=""
 .else
-CONFIGURE_ARGS+=	--disable-doc --disable-doxygen
-PLIST_SUB+=		HTMLDOCS="@comment "
+CONFIGURE_ARGS+=	--disable-doc --disable-doxygen --disable-html-docs
+PLIST_SUB+=		PORTDOCS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -Ee "s,^(pkgconfigdatadir).*,\1 = $$\(prefix\)/libdata/pkgconfig," \
-		${WRKSRC}/Makefile.in
-
 post-install:
-	@${FIND} ${STAGEDIR}${PREFIX}/include/cppunit ! -type d | \
+	${FIND} ${STAGEDIR}${PREFIX}/include/cppunit ! -type d | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${PREFIX}/include/cppunit -type d | ${SORT} -r | \
-		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${FIND} ${WRKSRC}/doc/html -not -type d \
+                | ${SED} 's,^${WRKSRC}/doc/html,${DOCSDIR_REL},' >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${PREFIX}/include/cppunit -type d | ${SORT} -r | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	${INSTALL_MAN} ${WRKSRC}/doc/FAQ ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
diff --git a/devel/cppunit/pkg-plist b/devel/cppunit/pkg-plist
index ab6884aeace1..265d46642b78 100644
--- a/devel/cppunit/pkg-plist
+++ b/devel/cppunit/pkg-plist
@@ -7,540 +7,6 @@ lib/libcppunit.so
 libdata/pkgconfig/cppunit.pc
 man/man1/cppunit-config.1.gz
 share/aclocal/cppunit.m4
-%%HTMLDOCS%%%%DOCSDIR%%/_additional_message_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_additional_message_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_additional_message_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_algorithm_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_algorithm_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_asserter_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_asserter_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_asserter_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_auto_register_suite_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_auto_register_suite_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_be_os_dynamic_library_manager_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_brief_test_progress_listener_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_brief_test_progress_listener_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_brief_test_progress_listener_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_compiler_outputter_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_compiler_outputter_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_compiler_outputter_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_config_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_config_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_api_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_api_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_deque_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_deque_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_map_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_map_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_set_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_set_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_stack_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_stack_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_vector_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_cpp_unit_vector_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_default_protector_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_default_protector_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_default_protector_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dll_main_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dynamic_library_manager_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dynamic_library_manager_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dynamic_library_manager_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dynamic_library_manager_exception_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dynamic_library_manager_exception_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_dynamic_library_manager_exception_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_exception_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_exception_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_exception_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_exception_test_case_decorator_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_exception_test_case_decorator_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_floating_point_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_floating_point_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_helper_macros_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_helper_macros_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_message_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_message_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_message_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_mfc_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_mfc_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_money_8dox.html
-%%HTMLDOCS%%%%DOCSDIR%%/_orthodox_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_orthodox_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_outputter_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_outputter_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_plug_in_manager_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_plug_in_manager_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_plug_in_manager_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_plug_in_parameters_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_plug_in_parameters_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_plug_in_parameters_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_portability_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_portability_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_chain_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_chain_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_chain_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_context_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_protector_context_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_qt_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_qt_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_repeated_test_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_repeated_test_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_repeated_test_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_select_dll_loader_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_select_dll_loader_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_shl_dynamic_library_manager_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_source_line_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_source_line_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_source_line_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_source_prefix_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_source_prefix_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_stream_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_stream_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_string_tools_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_string_tools_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_string_tools_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_synchronized_object_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_synchronized_object_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_synchronized_object_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_assert_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_assert_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_assert_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_caller_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_caller_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_case_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_case_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_case_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_case_decorator_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_case_decorator_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_case_decorator_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_composite_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_composite_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_composite_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_decorator_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_decorator_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_decorator_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_factory_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_factory_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_factory_registry_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_factory_registry_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_factory_registry_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_failure_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_failure_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_failure_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_fixture_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_fixture_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_fixture_factory_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_fixture_factory_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_leaf_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_leaf_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_leaf_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_listener_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_listener_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_namer_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_namer_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_namer_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_path_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_path_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_path_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_default_impl_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_default_impl_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_default_impl_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_interface_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_plug_in_interface_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_result_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_result_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_result_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_result_collector_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_result_collector_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_result_collector_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_runner_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_runner_d_s_plugin_v_c6_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_runner_d_s_plugin_v_c6_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_set_up_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_set_up_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_set_up_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_success_listener_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_success_listener_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_success_listener_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_builder_context_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_builder_context_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_builder_context_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_factory_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_test_suite_factory_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_outputter_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_outputter_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_outputter_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_progress_listener_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_progress_listener_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_progress_listener_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_result_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_result_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_result_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_runner_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_text_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_type_info_helper_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_type_info_helper_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_type_info_helper_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_unix_dynamic_library_manager_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_win32_dynamic_library_manager_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_document_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_document_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_document_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_element_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_element_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_element_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_outputter_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_outputter_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_outputter_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_outputter_hook_8cpp.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_outputter_hook_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/_xml_outputter_hook_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/annotated.html
-%%HTMLDOCS%%%%DOCSDIR%%/bc_s.png
-%%HTMLDOCS%%%%DOCSDIR%%/bdwn.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_additional_message-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_additional_message.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_additional_message.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_auto_register_registry-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_auto_register_registry.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_auto_register_suite-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_auto_register_suite.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_brief_test_progress_listener-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_brief_test_progress_listener.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_brief_test_progress_listener.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_compiler_outputter-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_compiler_outputter.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_compiler_outputter.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_concret_test_fixture_factory-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_concret_test_fixture_factory.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_concret_test_fixture_factory.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_default_protector-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_default_protector.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_default_protector.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_dynamic_library_manager-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_dynamic_library_manager.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_dynamic_library_manager_exception-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_dynamic_library_manager_exception.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_dynamic_library_manager_exception.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_exception-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_exception.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_exception.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_exception_test_case_decorator-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_exception_test_case_decorator.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_exception_test_case_decorator.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_functor-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_functor.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_functor.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_message-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_message.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_message.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_mfc_test_runner-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_mfc_test_runner.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_orthodox-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_orthodox.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_orthodox.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_outputter-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_outputter.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_outputter.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_plug_in_manager-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_plug_in_manager.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_plug_in_parameters-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_plug_in_parameters.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_chain-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_chain.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_chain.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_chain_1_1_protect_functor-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_chain_1_1_protect_functor.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_chain_1_1_protect_functor.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_context-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_context.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_guard-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_protector_guard.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_qt_test_runner-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_qt_test_runner.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_repeated_test-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_repeated_test.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_repeated_test.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_source_line-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_source_line.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object_1_1_exclusive_zone-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object_1_1_exclusive_zone.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object_1_1_synchronization_object-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_synchronized_object_1_1_synchronization_object.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_caller-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_caller.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_caller.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case_decorator-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case_decorator.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case_decorator.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case_method_functor-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case_method_functor.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_case_method_functor.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_composite-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_composite.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_composite.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_decorator-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_decorator.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_decorator.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory_registry-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory_registry.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory_registry.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory_registry_list-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_factory_registry_list.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_failure-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_failure.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_fixture-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_fixture.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_fixture.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_fixture_factory-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_fixture_factory.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_leaf-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_leaf.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_leaf.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_listener-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_listener.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_listener.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_namer-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_namer.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_path-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_path.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_plug_in_default_impl-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_plug_in_default_impl.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_plug_in_default_impl.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_plug_in_interface-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_plug_in_interface.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_result-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_result.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_result.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_result_collector-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_result_collector.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_result_collector.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_runner-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_runner.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_runner_1_1_wrapping_suite-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_runner_1_1_wrapping_suite.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_runner_1_1_wrapping_suite.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_set_up-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_set_up.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_set_up.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_success_listener-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_success_listener.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_success_listener.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_builder_context-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_builder_context.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_builder_context.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_builder_context_base-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_builder_context_base.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_builder_context_base.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_factory-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_factory.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_test_suite_factory.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_outputter-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_outputter.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_outputter.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_progress_listener-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_progress_listener.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_progress_listener.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_result-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_result.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_result.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_runner-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_runner.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_text_test_runner.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_document-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_document.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_element-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_element.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_outputter-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_outputter.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_outputter.png
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_outputter_hook-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/class_xml_outputter_hook.html
-%%HTMLDOCS%%%%DOCSDIR%%/classes.html
-%%HTMLDOCS%%%%DOCSDIR%%/closed.png
-%%HTMLDOCS%%%%DOCSDIR%%/cookbook_8dox.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2ui_2mfc_2_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2ui_2mfc_2_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2ui_2qt_2_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2ui_2qt_2_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2ui_2text_2_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_2ui_2text_2_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/cppunit_cookbook.html
-%%HTMLDOCS%%%%DOCSDIR%%/deprecated.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_049f00900054a603531d20d88cc39f6f.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_26d43355070f5c39e66a61b46022a4d1.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_2910dcd8d6c3afb9597b7036b03f24a0.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_372c2abdd00654fa8f29f5c89031676d.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_46213eeddacc38b1aba3944b4f382d15.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_603416cfd1bd390559cd48f94db548b1.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_68267d1309a1af8e8297ef4c3efbcdba.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_6fbf9af1107607a01d0ecbfc90eee038.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_a5e3211bd68405d5945af2cd60218f51.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_ba2a4a3a284960cb5e490c57e3886afc.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_c4b14d76b0344c563c835d95a27c8cd0.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_c5eaf16858184a764c0b183940730f6f.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_c66b53fb0f91463ed4d81811c52b1bd0.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_d44c64559bbebec7f509842c48db8b23.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_d8da05982244f7fc89f37a7a447f2d74.html
-%%HTMLDOCS%%%%DOCSDIR%%/dir_fd612b74aa2d313b560515f1c78ec58e.html
-%%HTMLDOCS%%%%DOCSDIR%%/doxygen.css
-%%HTMLDOCS%%%%DOCSDIR%%/doxygen.png
-%%HTMLDOCS%%%%DOCSDIR%%/dynsections.js
-%%HTMLDOCS%%%%DOCSDIR%%/files.html
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2blank.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2cl.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2doc.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2folderopen.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2lastnode.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2link.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2mnode.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2mo.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2node.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2ns.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2plastnode.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2pnode.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2splitbar.png
-%%HTMLDOCS%%%%DOCSDIR%%/ftv2vertline.png
-%%HTMLDOCS%%%%DOCSDIR%%/functions.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x61.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x62.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x63.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x64.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x65.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x66.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x67.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x68.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x69.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x6c.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x6d.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x6e.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x6f.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x70.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x71.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x72.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x73.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x74.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x75.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x77.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x78.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_0x7e.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_enum.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_eval.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x62.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x63.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x64.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x65.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x66.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x67.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x68.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x69.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x6c.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x6d.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x6e.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x6f.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x70.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x71.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x72.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x73.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x74.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x75.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x77.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x78.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_func_0x7e.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_type.html
-%%HTMLDOCS%%%%DOCSDIR%%/functions_vars.html
-%%HTMLDOCS%%%%DOCSDIR%%/globals.html
-%%HTMLDOCS%%%%DOCSDIR%%/globals_defs.html
-%%HTMLDOCS%%%%DOCSDIR%%/globals_func.html
-%%HTMLDOCS%%%%DOCSDIR%%/globals_type.html
-%%HTMLDOCS%%%%DOCSDIR%%/globals_vars.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___assertions.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___browsing_collected_test_result.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___creating_new_assertions.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___creating_test_suite.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___executing_test.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___tracking_test_execution.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___writing_test_fixture.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___writing_test_plug_in.html
-%%HTMLDOCS%%%%DOCSDIR%%/group___writing_test_result.html
-%%HTMLDOCS%%%%DOCSDIR%%/hierarchy.html
-%%HTMLDOCS%%%%DOCSDIR%%/index.html
-%%HTMLDOCS%%%%DOCSDIR%%/jquery.js
-%%HTMLDOCS%%%%DOCSDIR%%/modules.html
-%%HTMLDOCS%%%%DOCSDIR%%/money_example.html
-%%HTMLDOCS%%%%DOCSDIR%%/msvc6_2testrunner_2_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/msvc6_2testrunner_2_test_runner_8h_source.html
-%%HTMLDOCS%%%%DOCSDIR%%/namespace_mfc_ui.html
-%%HTMLDOCS%%%%DOCSDIR%%/namespace_qt_ui.html
-%%HTMLDOCS%%%%DOCSDIR%%/namespace_text_ui.html
-%%HTMLDOCS%%%%DOCSDIR%%/namespacemembers.html
-%%HTMLDOCS%%%%DOCSDIR%%/namespacemembers_type.html
-%%HTMLDOCS%%%%DOCSDIR%%/namespaces.html
-%%HTMLDOCS%%%%DOCSDIR%%/nav_f.png
-%%HTMLDOCS%%%%DOCSDIR%%/nav_g.png
-%%HTMLDOCS%%%%DOCSDIR%%/nav_h.png
-%%HTMLDOCS%%%%DOCSDIR%%/open.png
-%%HTMLDOCS%%%%DOCSDIR%%/other__documentation_8dox.html
-%%HTMLDOCS%%%%DOCSDIR%%/pages.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_asserter-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_asserter.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_cpp_unit_test_plug_in-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_cpp_unit_test_plug_in.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_cpp_unit_test_plug_in.png
-%%HTMLDOCS%%%%DOCSDIR%%/struct_i_test_runner_d_s_plugin_vtbl-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_i_test_runner_d_s_plugin_vtbl.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_plug_in_manager_1_1_plug_in_info-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_plug_in_manager_1_1_plug_in_info.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_string_tools-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/struct_string_tools.html
-%%HTMLDOCS%%%%DOCSDIR%%/structassertion__traits-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/structassertion__traits.html
-%%HTMLDOCS%%%%DOCSDIR%%/structassertion__traits_3_01double_01_4-members.html
-%%HTMLDOCS%%%%DOCSDIR%%/structassertion__traits_3_01double_01_4.html
-%%HTMLDOCS%%%%DOCSDIR%%/sync_off.png
-%%HTMLDOCS%%%%DOCSDIR%%/sync_on.png
-%%HTMLDOCS%%%%DOCSDIR%%/tab_a.png
-%%HTMLDOCS%%%%DOCSDIR%%/tab_b.png
-%%HTMLDOCS%%%%DOCSDIR%%/tab_h.png
-%%HTMLDOCS%%%%DOCSDIR%%/tab_s.png
-%%HTMLDOCS%%%%DOCSDIR%%/tabs.css
-%%HTMLDOCS%%%%DOCSDIR%%/todo.html
-%%HTMLDOCS%%%%DOCSDIR%%/ui_2text_2_text_test_runner_8h.html
-%%HTMLDOCS%%%%DOCSDIR%%/ui_2text_2_text_test_runner_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 9973c2b7ad2b..9f7db75131b4 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doxygen
-PORTVERSION=	1.8.3.1
-PORTREVISION=	1
+PORTVERSION=	1.8.7
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
@@ -16,15 +15,22 @@ COMMENT=	Documentation system for C, C++, and other languages
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
+BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake \
+		flex>0:${PORTSDIR}/textproc/flex \
+		python:${PORTSDIR}/lang/python \
+		dvips:${PORTSDIR}/print/tex-dvipsk \
+		${LOCALBASE}/share/fonts/cm-super/README:${PORTSDIR}/print/cm-super
+
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
 USES=		bison iconv perl5 gmake
+USE_PYTHON=	2
 ALL_TARGET=	all
 HAS_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=	yes
 QT_NONSTANDARD=	yes	# non-standard configure arguments
 CONFIGURE_ARGS=	--prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \
-		--install "${INSTALL}"
+		--install "${INSTALL}" --flex ${LOCALBASE}/bin/flex
 REINPLACE_ARGS=	-i ''
 
 EXTRACT_AFTER_ARGS=	--exclude '*/libmd5'	\
@@ -45,7 +51,6 @@ PDFDOCS_DESC=	Install documentation in PDF format
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
 ALL_TARGET+=	docs
-USE_PYTHON_BUILD=	yes
 BUILD_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 
 .if ${PORT_OPTIONS:MPDFDOCS}
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index e1689347233b..550afd722a04 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.8.3.1.src.tar.gz) = 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55
-SIZE (doxygen-1.8.3.1.src.tar.gz) = 6196887
+SHA256 (doxygen-1.8.7.src.tar.gz) = c6eac6b6e82148ae15ec5aecee4631547359f284af1ce94474d046ebca6ee3d9
+SIZE (doxygen-1.8.7.src.tar.gz) = 4796875
diff --git a/devel/doxygen/files/patch-Makefile.in b/devel/doxygen/files/patch-Makefile.in
new file mode 100644
index 000000000000..7eb985013d0e
--- /dev/null
+++ b/devel/doxygen/files/patch-Makefile.in
@@ -0,0 +1,49 @@
+--- Makefile.in-orig	2014-06-14 08:30:10.000000000 +0200
++++ Makefile.in	2014-06-14 08:31:21.000000000 +0200
+@@ -16,11 +16,10 @@
+ 	cd addon/doxyapp ; $(MAKE) clean
+ 
+ clean: FORCE
+-	- cd examples ; $(MAKE) clean
+-	- cd doc ; $(MAKE) clean
+-	- cd qtools ; $(MAKE) clean
+-	- cd src ; $(MAKE) clean
+-	- cd libmd5 ; $(MAKE) clean
++	-cd examples ; $(MAKE) clean
++	-cd doc ; $(MAKE) clean
++	-cd qtools ; $(MAKE) clean
++	-cd src ; $(MAKE) clean
+ 	-cd addon/doxywizard ; $(MAKE) clean
+ 	-cd addon/doxysearch ; $(MAKE) clean
+ 	-cd addon/doxyapp ; $(MAKE) clean
+@@ -32,7 +31,6 @@
+ 
+ distclean: clean
+ 	-cd src ; $(MAKE) distclean
+-	-cd libmd5 ; $(MAKE) distclean
+ 	-cd addon/doxywizard ; $(MAKE) distclean
+ 	-cd addon/doxysearch ; $(MAKE) distclean
+ 	-cd addon/doxyapp ; $(MAKE) distclean
+@@ -51,9 +49,8 @@
+ 	-rm -rf xml
+ 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
+ 	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
+-	-rm -f libmd5/Makefile.libmd5
+ 	-rm -f .makeconfig .tmakeconfig
+-	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
++	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro
+ 	-rm -rf generated_src
+ 	-rm -f addon/doxywizard/doxywizard.pro
+ 	-rm -f VERSION
+@@ -93,9 +90,9 @@
+ 	cd doc ; $(MAKE)
+ 
+ pdf: docs
+-	cd latex ; $(MAKE)
++	cd latex ; patch < ../refman-patch ; patch < ../latex-patch ; $(MAKE)
+ 
+-DISTFILES =  Doxyfile libmd5 addon tmake doc examples bin lib objects testing \
++DISTFILES =  Doxyfile addon tmake doc examples bin lib objects testing \
+              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
+              Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
+              VERSION README.md packages winbuild jquery
diff --git a/devel/doxygen/files/patch-addon-doxywizard-Makefile.in b/devel/doxygen/files/patch-addon-doxywizard-Makefile.in
index 8f017b9283ba..056ffaf79939 100644
--- a/devel/doxygen/files/patch-addon-doxywizard-Makefile.in
+++ b/devel/doxygen/files/patch-addon-doxywizard-Makefile.in
@@ -1,11 +1,11 @@
---- addon/doxywizard/Makefile.in.orig	2010-05-23 10:51:31.000000000 -0400
-+++ addon/doxywizard/Makefile.in	2010-06-15 07:44:44.000000000 -0400
+--- addon/doxywizard/Makefile.in-orig	2014-06-13 23:29:16.000000000 +0200
++++ addon/doxywizard/Makefile.in	2014-06-13 23:28:50.000000000 +0200
 @@ -10,7 +10,7 @@
  # See the GNU General Public License for more details.
  # 
  
--QMAKE=qmake $(MKSPECS)
-+QMAKE=qmake-qt4 $(MKSPECS)
+-QMAKE=$(QTDIR)/bin/qmake $(MKSPECS)
++QMAKE=$(QTDIR)/bin/qmake-qt4 $(MKSPECS)
+ INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
  
  all: Makefile.doxywizard  
- 	$(MAKE) -f Makefile.doxywizard 
diff --git a/devel/doxygen/files/patch-configure b/devel/doxygen/files/patch-configure
index 2127793aa43c..7994ac79ad0e 100644
--- a/devel/doxygen/files/patch-configure
+++ b/devel/doxygen/files/patch-configure
@@ -1,15 +1,28 @@
---- configure.orig	2012-12-27 06:24:51.000000000 -0500
-+++ configure	2012-12-28 12:12:33.000000000 -0500
-@@ -281,7 +281,7 @@
+--- configure.orig	2014-04-20 17:17:29.000000000 +0200
++++ configure	2014-06-13 23:25:23.000000000 +0200
+@@ -363,25 +363,25 @@
      echo "  QTDIR environment variable not set!"
-     echo -n "  Checking for Qt..."
+     printf "  Checking for Qt..."
      for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
 -      if test -x "$d/bin/qmake"; then
 +      if test -x "$d/bin/qmake-qt4"; then
          QTDIR=$d
+         break 2
        fi
      done
-@@ -292,7 +292,7 @@
+   else
+-    if test -e "$QTDIR/bin/qmake"; then
++    if test -e "$QTDIR/bin/qmake-qt4"; then
+       printf "  Detected Qt via the QTDIR environment variable..."
+     else
+       printf "ERROR Detected Qt via the QTDIR environment variable..."
+-      echo ", but $QTDIR/bin/qmake does not exist."
+-      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
++      echo ", but $QTDIR/bin/qmake-qt4 does not exist."
++      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
+       exit 2
+     fi
+   fi
    if test -z "$QTDIR"; then
      echo "QTDIR not set and Qt not found at standard locations!"
      echo
@@ -18,7 +31,7 @@
      echo "check the Qt installation instructions!"
      exit 2
    fi
-@@ -604,7 +604,7 @@
+@@ -848,7 +848,7 @@
  fi
  if test "$f_wizard" = YES; then
    cat >> .tmakeconfig <<EOF
@@ -27,7 +40,7 @@
  EOF
  fi
  
-@@ -621,7 +621,7 @@
+@@ -859,7 +859,7 @@
  EOF
  fi
  
@@ -36,17 +49,17 @@
  
  for i in $f_inmakefiles ; do
       SRC=$i
-@@ -645,7 +645,6 @@
-        fi
-        echo "all: src/version.cpp $EXTRADEPS" >> $DST
+@@ -883,7 +883,6 @@
+ #       fi
+        echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
         echo "	\$(MAKE) -C qtools" >> $DST
 -       echo "	\$(MAKE) -C libmd5" >> $DST
         echo "	\$(MAKE) -C src" >> $DST
         if test $f_wizard = YES; then
           echo "	\$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST
-@@ -678,7 +677,7 @@
- cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxycfg.t
- cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" > src/libdoxygen.t
+@@ -921,7 +920,7 @@
+ cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
+ cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t
  
 -f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.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 addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" 
 +f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.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 addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" 
diff --git a/devel/doxygen/files/patch-examples-Makefile.in b/devel/doxygen/files/patch-examples-Makefile.in
deleted file mode 100644
index 628300a0319f..000000000000
--- a/devel/doxygen/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Disables tests to avoid hang on stable/9 and head.
-
-Temporary fix until correct solution is found.
-
-
-Index: examples/Makefile.in
-@@ -124,7 +124,7 @@
- #	$(DOXYGEN)/bin/doxygen dbusxml.cfg
- 
- diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
--ifneq ($(HAVE_DOT),)
--	$(DOXYGEN)/bin/doxygen diagrams.cfg
--endif
-+#ifneq ($(HAVE_DOT),)
-+#	$(DOXYGEN)/bin/doxygen diagrams.cfg
-+#endif
diff --git a/devel/doxygen/files/patch-latex b/devel/doxygen/files/patch-latex
new file mode 100644
index 000000000000..8c96a67b7322
--- /dev/null
+++ b/devel/doxygen/files/patch-latex
@@ -0,0 +1,30 @@
+--- latex-patch.orig	1970-01-01 01:00:00.000000000 +0100
++++ latex-patch	2014-06-13 23:18:40.000000000 +0200
+@@ -0,0 +1,27 @@
++--- Makefile.orig	2014-06-13 23:14:28.000000000 +0200
+++++ Makefile	2014-06-13 23:18:27.000000000 +0200
++@@ -3,19 +3,19 @@
++ pdf: refman.pdf
++ 
++ refman.pdf: clean refman.tex
++-	pdflatex refman
+++	-pdflatex -interaction nonstopmode refman
++ 	makeindex refman.idx
++-	pdflatex refman
+++	-pdflatex -interaction nonstopmode refman
++ 	latex_count=8 ; \
++ 	while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
++ 	    do \
++ 	      echo "Rerunning latex...." ;\
++-	      pdflatex refman ;\
+++	      pdflatex -interaction nonstopmode refman ;\
++ 	      latex_count=`expr $$latex_count - 1` ;\
++ 	    done
++ 	makeindex refman.idx
++-	pdflatex refman
++-
+++	-pdflatex -interaction nonstopmode refman
+++	cp refman.pdf doxygen_manual.pdf
++ 
++ clean:
++ 	rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log *.out *.brf *.blg *.bbl refman.pdf
diff --git a/devel/doxygen/files/patch-md5 b/devel/doxygen/files/patch-md5
deleted file mode 100644
index 5474f0f4d0e2..000000000000
--- a/devel/doxygen/files/patch-md5
+++ /dev/null
@@ -1,221 +0,0 @@
---- src/definition.cpp.orig	2011-08-19 15:34:17.000000000 +0800
-+++ src/definition.cpp	2011-10-31 17:32:47.870380518 +0800
-@@ -18,6 +18,7 @@
- #include "qtbc.h"
- #include <ctype.h>
- #include <qregexp.h>
-+#include <sys/types.h>
- #include "md5.h"
- #include <stdio.h>
- #include <stdlib.h>
-@@ -361,13 +362,11 @@
- 
- bool Definition::_docsAlreadyAdded(const QCString &doc)
- {
--  uchar md5_sig[16];
-   QCString sigStr(33);
-   // to avoid mismatches due to differences in indenting, we first remove
-   // double whitespaces...
-   QCString docStr = doc.simplifyWhiteSpace();
--  MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
-+  MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.data());
-   if (m_impl->docSignatures.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
-   {
-     m_impl->docSignatures+=":"+sigStr;
---- src/dirdef.cpp.orig	2011-07-26 19:54:31.000000000 +0800
-+++ src/dirdef.cpp	2011-10-31 17:32:47.872380214 +0800
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include "md5.h"
- 
- #include "dirdef.h"
-@@ -75,10 +76,8 @@
-   QCString result;
- 
-   // 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;
- 
-   // old algorithm
---- src/dot.cpp.orig	2011-08-09 02:06:19.000000000 +0800
-+++ src/dot.cpp	2011-10-31 17:32:47.877389789 +0800
-@@ -39,6 +39,7 @@
- #include <qdir.h>
- #include <qfile.h>
- #include "ftextstream.h"
-+#include <sys/types.h>
- #include "md5.h"
- #include <qqueue.h>
- 
-@@ -2063,10 +2064,8 @@
-     }
-     writeGraphFooter(md5stream);
-     resetReNumbering();
--    uchar md5_sig[16];
-     QCString sigStr(33);
--    MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
--    MD5SigToString(md5_sig,sigStr.data(),33);
-+    MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
-     bool regenerate=FALSE;
-     if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
-         !checkDeliverables(absImgName,absMapName))
-@@ -2758,10 +2757,8 @@
-     }
-   }
-   writeGraphFooter(md5stream);
--  uchar md5_sig[16];
-   QCString sigStr(33);
--  MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
-+  MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data());
-   if (reNumber)
-   {
-     resetReNumbering();
-@@ -3609,10 +3606,8 @@
-   QGString theGraph;
-   FTextStream md5stream(&theGraph);
-   m_dir->writeDepGraph(md5stream);
--  uchar md5_sig[16];
-   QCString sigStr(33);
--  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
-+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
-   bool regenerate=FALSE;
-   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
-       !checkDeliverables(format==BITMAP ? absImgName :
-@@ -3739,10 +3734,8 @@
-   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
-   md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
-   writeGraphFooter(md5stream);
--  uchar md5_sig[16];
-   QCString sigStr(33);
--  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
-+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
-   QCString absBaseName = (QCString)path+"/graph_legend";
-   QCString absDotName  = absBaseName+".dot";
-   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
-@@ -4139,10 +4132,8 @@
- 
-   writeGraphFooter(md5stream);
-   resetReNumbering();
--  uchar md5_sig[16];
-   QCString sigStr(33);
--  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
-+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
-   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
-   QCString baseName    = m_diskName;
-   QCString imgName     = baseName+"."+imgExt;
---- src/doxygen.pro.in.orig	2011-01-04 04:14:46.000000000 +0800
-+++ src/doxygen.pro.in	2011-10-31 17:32:47.879381383 +0800
-@@ -18,7 +18,7 @@
- CONFIG       =	console warn_on $extraopts
- HEADERS      =	doxygen.h 
- SOURCES      =	main.cpp 
--unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
-+unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread
- win32:INCLUDEPATH          += .
- win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread
- win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
-@@ -28,7 +28,7 @@
- win32:TMAKE_CXXFLAGS       += -DQT_NODLL
- win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread
- win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
--INCLUDEPATH                += ../qtools ../libmd5 .
-+INCLUDEPATH                += ../qtools .
- DESTDIR                    =  ../bin
- TARGET                     =  doxygen
- unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
---- src/memberdef.cpp.orig	2011-08-18 22:46:40.000000000 +0800
-+++ src/memberdef.cpp	2011-10-31 17:35:14.027187598 +0800
-@@ -19,6 +19,7 @@
- #include <qglobal.h>
- #include <qregexp.h>
- #include <assert.h>
-+#include <sys/types.h>
- #include "md5.h"
- #include "memberdef.h"
- #include "membername.h"
-@@ -2771,11 +2772,9 @@
-   }
-   
-   // convert to md5 hash
--  uchar md5_sig[16];
-   QCString sigStr(33);
--  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
-+  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data());
-   //printf("memAnchor=%s\n",memAnchor.data());
--  MD5SigToString(md5_sig,sigStr.data(),33);
-   m_impl->anc = "a"+sigStr;
- }
- 
---- src/membergroup.cpp.orig	2011-04-22 18:08:07.000000000 +0800
-+++ src/membergroup.cpp	2011-10-31 17:32:47.886381993 +0800
-@@ -265,12 +265,10 @@
- 
- QCString MemberGroup::anchor() const
- {
--  uchar md5_sig[16];
-   QCString sigStr(33);
-   QCString locHeader = grpHeader;
-   if (locHeader.isEmpty()) locHeader="[NOHEADER]";
--  MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
--  MD5SigToString(md5_sig,sigStr.data(),33);
-+  MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.data());
-   return "amgrp"+sigStr;
- }
- 
---- src/util.cpp.orig	2011-08-19 23:11:12.000000000 +0800
-+++ src/util.cpp	2011-10-31 17:32:47.892382197 +0800
-@@ -20,6 +20,7 @@
- #include <errno.h>
- #include <math.h>
- 
-+#include <sys/types.h>
- #include "md5.h"
- 
- #include "qtbc.h"
-@@ -4901,16 +4902,16 @@
-     if (resultLen>=128) // prevent names that cannot be created!
-     {
-       // 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; 
-     }
-   }
-   if (createSubdirs)
-   {
-+#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
-     int l1Dir=0,l2Dir=0;
-+#endif
- 
- #if MAP_ALGO==ALGO_COUNT 
-     // old algorithm, has the problem that after regeneration the
-@@ -4941,12 +4942,13 @@
-     l2Dir = (dirNum>>4)&0xff;
- #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
-   }
-   //printf("*** convertNameToFile(%s)->%s\n",name,result.data());
-   return result;
diff --git a/devel/doxygen/files/patch-md5-Doxyfile b/devel/doxygen/files/patch-md5-Doxyfile
new file mode 100644
index 000000000000..3eba034fac40
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-Doxyfile
@@ -0,0 +1,11 @@
+--- Doxyfile.orig	2014-06-14 08:11:43.000000000 +0200
++++ Doxyfile	2014-06-14 08:11:47.000000000 +0200
+@@ -257,7 +257,7 @@
+ MACRO_EXPANSION        = YES
+ EXPAND_ONLY_PREDEF     = YES
+ SEARCH_INCLUDES        = YES
+-INCLUDE_PATH           = qtools libmd5
++INCLUDE_PATH           = qtools
+ INCLUDE_FILE_PATTERNS  =
+ PREDEFINED             =
+ EXPAND_AS_DEFINED      =
diff --git a/devel/doxygen/files/patch-md5-definition b/devel/doxygen/files/patch-md5-definition
new file mode 100644
index 000000000000..f2e84bf63150
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-definition
@@ -0,0 +1,25 @@
+--- src/definition.cpp-orig	2014-06-11 20:09:07.000000000 +0200
++++ src/definition.cpp	2014-06-11 20:12:32.000000000 +0200
+@@ -17,6 +17,7 @@
+ 
+ #include <ctype.h>
+ #include <qregexp.h>
++#include <sys/types.h>
+ #include "md5.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -539,13 +540,11 @@
+ 
+ bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
+ {
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+   // to avoid mismatches due to differences in indenting, we first remove
+   // double whitespaces...
+   QCString docStr = doc.simplifyWhiteSpace();
+-  MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.data());
+   //printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
+   //    name().data(),doc.data(),sigStr.data(),sigList.data());
+   if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it
diff --git a/devel/doxygen/files/patch-md5-dirdef b/devel/doxygen/files/patch-md5-dirdef
new file mode 100644
index 000000000000..5789af46e2fa
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-dirdef
@@ -0,0 +1,19 @@
+--- src/dirdef.cpp-orig	2014-06-11 20:11:16.000000000 +0200
++++ src/dirdef.cpp	2014-06-11 20:11:59.000000000 +0200
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include "md5.h"
+ 
+ #include "dirdef.h"
+@@ -83,10 +84,8 @@
+   QCString result;
+ 
+   // 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;
+ 
+   // old algorithm
diff --git a/devel/doxygen/files/patch-md5-dot b/devel/doxygen/files/patch-md5-dot
new file mode 100644
index 000000000000..d833f4a9059d
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-dot
@@ -0,0 +1,70 @@
+--- src/dot.cpp-orig	2014-06-11 20:13:39.000000000 +0200
++++ src/dot.cpp	2014-06-11 20:15:32.000000000 +0200
+@@ -44,6 +44,7 @@
+ #include "dirdef.h"
+ #include "vhdldocgen.h"
+ #include "ftextstream.h"
++#include <sys/types.h>
+ #include "md5.h"
+ #include "memberlist.h"
+ #include "groupdef.h"
+@@ -2318,10 +2319,8 @@
+     }
+     writeGraphFooter(md5stream);
+     resetReNumbering();
+-    uchar md5_sig[16];
+     QCString sigStr(33);
+-    MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
+-    MD5SigToString(md5_sig,sigStr.data(),33);
++    MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
+     bool regenerate=FALSE;
+     if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
+         !checkDeliverables(absImgName,absMapName))
+@@ -3021,10 +3020,8 @@
+     }
+   }
+   writeGraphFooter(md5stream);
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.data());
+   if (reNumber)
+   {
+     resetReNumbering();
+@@ -3895,10 +3892,8 @@
+   QGString theGraph;
+   FTextStream md5stream(&theGraph);
+   m_dir->writeDepGraph(md5stream);
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
+   bool regenerate=FALSE;
+   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
+       !checkDeliverables(format==BITMAP ? absImgName :
+@@ -4025,10 +4020,8 @@
+   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
+   md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
+   writeGraphFooter(md5stream);
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
+   QCString absBaseName = (QCString)path+"/graph_legend";
+   QCString absDotName  = absBaseName+".dot";
+   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
+@@ -4424,10 +4417,8 @@
+ 
+   writeGraphFooter(md5stream);
+   resetReNumbering();
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.data());
+   QCString imgExt      = Config_getEnum("DOT_IMAGE_FORMAT");
+   QCString baseName    = m_diskName;
+   QCString imgName     = baseName+"."+imgExt;
diff --git a/devel/doxygen/files/patch-md5-doxygen.pro.in b/devel/doxygen/files/patch-md5-doxygen.pro.in
new file mode 100644
index 000000000000..75ad3757fd2a
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-doxygen.pro.in
@@ -0,0 +1,20 @@
+--- src/doxygen.pro.in-orig	2014-06-11 20:16:21.000000000 +0200
++++ src/doxygen.pro.in	2014-06-11 20:16:59.000000000 +0200
+@@ -18,7 +18,7 @@
+ CONFIG       =	console warn_on $extraopts
+ HEADERS      =	doxygen.h 
+ SOURCES      =	main.cpp 
+-unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
++unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+ win32:INCLUDEPATH          += .
+ win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+ win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
+@@ -29,7 +29,7 @@
+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+ DEPENDPATH                 += ../generated_src/doxygen
+-INCLUDEPATH                += ../qtools ../libmd5 .
++INCLUDEPATH                += ../qtools .
+ DESTDIR                    =  ../bin
+ TARGET                     =  doxygen
+ unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
diff --git a/devel/doxygen/files/patch-md5-memberdef b/devel/doxygen/files/patch-md5-memberdef
new file mode 100644
index 000000000000..86b2ba655836
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-memberdef
@@ -0,0 +1,23 @@
+--- src/memberdef.cpp-orig	2014-06-11 20:17:47.000000000 +0200
++++ src/memberdef.cpp	2014-06-11 20:19:38.000000000 +0200
+@@ -17,6 +17,7 @@
+ #include <qglobal.h>
+ #include <qregexp.h>
+ #include <assert.h>
++#include <sys/types.h>
+ #include "md5.h"
+ #include "memberdef.h"
+ #include "membername.h"
+@@ -3305,11 +3306,9 @@
+   }
+ 
+   // convert to md5 hash
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+-  MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
+   //printf("memAnchor=%s\n",memAnchor.data());
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.data());
+   m_impl->anc = "a"+sigStr;
+ }
+ 
diff --git a/devel/doxygen/files/patch-md5-membergroup b/devel/doxygen/files/patch-md5-membergroup
new file mode 100644
index 000000000000..189140f5218c
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-membergroup
@@ -0,0 +1,24 @@
+--- src/membergroup.cpp-orig	2014-06-11 20:23:51.000000000 +0200
++++ src/membergroup.cpp	2014-06-11 20:24:25.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "docparser.h"
+ #include "marshal.h"
+ #include "entry.h"
++#include <sys/types.h>
+ #include "md5.h"
+ 
+ //static QCString idToName(int id)
+@@ -307,12 +308,10 @@
+ 
+ QCString MemberGroup::anchor() const
+ {
+-  uchar md5_sig[16];
+   QCString sigStr(33);
+   QCString locHeader = grpHeader;
+   if (locHeader.isEmpty()) locHeader="[NOHEADER]";
+-  MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
+-  MD5SigToString(md5_sig,sigStr.data(),33);
++  MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.data());
+   return "amgrp"+sigStr;
+ }
+ 
diff --git a/devel/doxygen/files/patch-md5-util b/devel/doxygen/files/patch-md5-util
new file mode 100644
index 000000000000..764a835e29fd
--- /dev/null
+++ b/devel/doxygen/files/patch-md5-util
@@ -0,0 +1,48 @@
+--- src/util.cpp-orig	2014-06-11 20:24:54.000000000 +0200
++++ src/util.cpp	2014-06-11 20:26:48.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <errno.h>
+ #include <math.h>
+ 
++#include <sys/types.h>
+ #include "md5.h"
+ 
+ #include <qregexp.h>
+@@ -5283,16 +5284,16 @@
+     if (resultLen>=128) // prevent names that cannot be created!
+     {
+       // 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; 
+     }
+   }
+   if (createSubdirs)
+   {
++#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
+     int l1Dir=0,l2Dir=0;
++#endif
+ 
+ #if MAP_ALGO==ALGO_COUNT 
+     // old algorithm, has the problem that after regeneration the
+@@ -5323,12 +5324,13 @@
+     l2Dir = (dirNum>>4)&0xff;
+ #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
+   }
+   //printf("*** convertNameToFile(%s)->%s\n",name,result.data());
+   return result;
diff --git a/devel/doxygen/files/patch-refman b/devel/doxygen/files/patch-refman
new file mode 100644
index 000000000000..b528ad8b98bc
--- /dev/null
+++ b/devel/doxygen/files/patch-refman
@@ -0,0 +1,42 @@
+--- refman-patch.orig	2014-06-28 22:08:12.000000000 +0200
++++ refman-patch	2014-06-28 22:15:22.000000000 +0200
+@@ -0,0 +1,39 @@
++--- refman.tex.orig	2014-06-28 22:09:39.000000000 +0200
+++++ refman.tex	2014-06-28 22:14:02.000000000 +0200
++@@ -13,6 +13,8 @@
++ \usepackage{textcomp}
++ \usepackage[nointegrals]{wasysym}
++ \usepackage[table]{xcolor}
+++\usepackage{longtable}
+++\usepackage{enumitem}
++ 
++ % Font selection
++ \usepackage[T1]{fontenc}
++@@ -93,7 +95,7 @@
++ % Hyperlinks (required, but should be loaded last)
++ \usepackage{ifpdf}
++ \ifpdf
++-  \usepackage[pdftex,pagebackref=true]{hyperref}
+++  \usepackage[pdftex,unicode,pagebackref=true]{hyperref}
++ \else
++   \usepackage[ps2pdf,pagebackref=true]{hyperref}
++ \fi
++@@ -118,7 +120,6 @@
++ \hypersetup{pageanchor=false,
++              bookmarks=true,
++              bookmarksnumbered=true,
++-             pdfencoding=unicode
++             }
++ \pagenumbering{roman}
++ \begin{titlepage}
++@@ -244,10 +245,6 @@
++ \label{perlmod}
++ \hypertarget{perlmod}{}
++ \input{perlmod}
++-\chapter{Perl Module Tree Nodes}
++-\label{perlmod_tree}
++-\hypertarget{perlmod_tree}{}
++-\input{perlmod_tree}
++ \chapter{Doxygen's Internals}
++ \label{arch}
++ \hypertarget{arch}{}
diff --git a/devel/doxygen/files/patch-warnings b/devel/doxygen/files/patch-warnings
deleted file mode 100644
index b2e50c9e729b..000000000000
--- a/devel/doxygen/files/patch-warnings
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index bcd08ee0698b..4eb7296f7c67 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdbusmenu-qt
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
diff --git a/devel/libdbusmenu-qt/pkg-plist b/devel/libdbusmenu-qt/pkg-plist
index 008bb79fba1b..2b4fcc3cee27 100644
--- a/devel/libdbusmenu-qt/pkg-plist
+++ b/devel/libdbusmenu-qt/pkg-plist
@@ -28,7 +28,6 @@ libdata/pkgconfig/dbusmenu-qt.pc
 %%GENDOCS%%%%DOCSDIR%%/dynsections.js
 %%GENDOCS%%%%DOCSDIR%%/files.html
 %%GENDOCS%%%%DOCSDIR%%/ftv2blank.png
-%%GENDOCS%%%%DOCSDIR%%/ftv2cl.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2doc.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2folderopen.png
@@ -36,9 +35,7 @@ libdata/pkgconfig/dbusmenu-qt.pc
 %%GENDOCS%%%%DOCSDIR%%/ftv2link.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2mnode.png
-%%GENDOCS%%%%DOCSDIR%%/ftv2mo.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2node.png
-%%GENDOCS%%%%DOCSDIR%%/ftv2ns.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2plastnode.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2pnode.png
 %%GENDOCS%%%%DOCSDIR%%/ftv2splitbar.png
@@ -53,41 +50,41 @@ libdata/pkgconfig/dbusmenu-qt.pc
 %%GENDOCS%%%%DOCSDIR%%/nav_h.png
 %%GENDOCS%%%%DOCSDIR%%/open.png
 %%GENDOCS%%%%DOCSDIR%%/pages.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_61.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_61.js
-%%GENDOCS%%%%DOCSDIR%%/search/all_63.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_63.js
-%%GENDOCS%%%%DOCSDIR%%/search/all_64.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_64.js
-%%GENDOCS%%%%DOCSDIR%%/search/all_69.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_69.js
-%%GENDOCS%%%%DOCSDIR%%/search/all_6d.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_6d.js
-%%GENDOCS%%%%DOCSDIR%%/search/all_73.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_73.js
-%%GENDOCS%%%%DOCSDIR%%/search/all_75.html
-%%GENDOCS%%%%DOCSDIR%%/search/all_75.js
-%%GENDOCS%%%%DOCSDIR%%/search/classes_64.html
-%%GENDOCS%%%%DOCSDIR%%/search/classes_64.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_0.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_0.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_1.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_1.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_2.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_2.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_3.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_3.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_4.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_4.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_5.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_5.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_6.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_6.js
+%%GENDOCS%%%%DOCSDIR%%/search/classes_0.html
+%%GENDOCS%%%%DOCSDIR%%/search/classes_0.js
 %%GENDOCS%%%%DOCSDIR%%/search/close.png
-%%GENDOCS%%%%DOCSDIR%%/search/functions_61.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_61.js
-%%GENDOCS%%%%DOCSDIR%%/search/functions_63.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_63.js
-%%GENDOCS%%%%DOCSDIR%%/search/functions_64.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_64.js
-%%GENDOCS%%%%DOCSDIR%%/search/functions_69.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_69.js
-%%GENDOCS%%%%DOCSDIR%%/search/functions_6d.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_6d.js
-%%GENDOCS%%%%DOCSDIR%%/search/functions_73.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_73.js
-%%GENDOCS%%%%DOCSDIR%%/search/functions_75.html
-%%GENDOCS%%%%DOCSDIR%%/search/functions_75.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_0.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_0.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_1.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_1.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_2.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_2.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_3.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_3.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_4.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_4.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_5.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_5.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_6.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_6.js
 %%GENDOCS%%%%DOCSDIR%%/search/mag_sel.png
 %%GENDOCS%%%%DOCSDIR%%/search/nomatches.html
-%%GENDOCS%%%%DOCSDIR%%/search/pages_64.html
-%%GENDOCS%%%%DOCSDIR%%/search/pages_64.js
+%%GENDOCS%%%%DOCSDIR%%/search/pages_0.html
+%%GENDOCS%%%%DOCSDIR%%/search/pages_0.js
 %%GENDOCS%%%%DOCSDIR%%/search/search.css
 %%GENDOCS%%%%DOCSDIR%%/search/search.js
 %%GENDOCS%%%%DOCSDIR%%/search/search_l.png
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 5456f56fd28d..dc85277d0c91 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libthai
 PORTVERSION=	0.1.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/libthai/
 
@@ -14,9 +14,10 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libdatrie.so:${PORTSDIR}/devel/libdatrie
 
-GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig tar:xz
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_SUB=	yes
diff --git a/devel/libthai/pkg-plist b/devel/libthai/pkg-plist
index 5070bdae2ac5..317a10a09909 100644
--- a/devel/libthai/pkg-plist
+++ b/devel/libthai/pkg-plist
@@ -44,7 +44,6 @@ libdata/pkgconfig/libthai.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/dynsections.js
 %%DOXYGEN%%%%DOCSDIR%%/html/files.html
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2blank.png
-%%DOXYGEN%%%%DOCSDIR%%/html/ftv2cl.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2doc.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2folderclosed.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2folderopen.png
@@ -52,9 +51,7 @@ libdata/pkgconfig/libthai.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2link.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2mlastnode.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2mnode.png
-%%DOXYGEN%%%%DOCSDIR%%/html/ftv2mo.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2node.png
-%%DOXYGEN%%%%DOCSDIR%%/html/ftv2ns.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2plastnode.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2pnode.png
 %%DOXYGEN%%%%DOCSDIR%%/html/ftv2splitbar.png
diff --git a/graphics/partio/Makefile b/graphics/partio/Makefile
index aeecc92b494b..33f45bf98aca 100644
--- a/graphics/partio/Makefile
+++ b/graphics/partio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	partio
 PORTVERSION=	1.1.0.20140128
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics math
 
 MAINTAINER=	mva@FreeBSD.org
diff --git a/graphics/partio/pkg-plist b/graphics/partio/pkg-plist
index c57a6b379978..3d05786ed158 100644
--- a/graphics/partio/pkg-plist
+++ b/graphics/partio/pkg-plist
@@ -44,7 +44,6 @@ lib/libpartio.a
 %%PORTDOCS%%%%DOCSDIR%%/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/files.html
 %%PORTDOCS%%%%DOCSDIR%%/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2cl.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2doc.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2folderopen.png
@@ -52,9 +51,7 @@ lib/libpartio.a
 %%PORTDOCS%%%%DOCSDIR%%/ftv2link.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2mo.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2ns.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2plastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2pnode.png
 %%PORTDOCS%%%%DOCSDIR%%/ftv2splitbar.png
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index 77bd96248dac..ec6483d44834 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fflas-ffpack
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://linalg.org/ LOCAL/bf
 
@@ -14,10 +14,12 @@ LICENSE=	LGPL20
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
+USES=		shebangfix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp="${LOCALBASE}"
+SHEBANG_FILES=	fflas-ffpack-config.in
 
-OPTIONS_DEFINE=		DOXYGEN OPTIMIZED_CFLAGS
+OPTIONS_DEFINE=	DOXYGEN OPTIMIZED_CFLAGS
 
 .include <bsd.port.options.mk>
 
@@ -27,8 +29,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if defined(MAINTAINER_MODE)
-CONFIGURE_ARGS+=	 --with-givaro="${LOCALBASE}"
-LIB_DEPENDS+=	libgivaro.so:${PORTSDIR}/math/givaro
+CONFIGURE_ARGS+=	--with-givaro="${LOCALBASE}"
+LIB_DEPENDS+=		libgivaro.so:${PORTSDIR}/math/givaro
 .else
 CONFIGURE_ARGS+=	--with-givaro=no
 .endif
@@ -48,7 +50,7 @@ USES+=		fortran
 CONFIGURE_ARGS+=	--with-gsl="${LOCALBASE}"
 LIB_DEPENDS+=	libgslcblas.so:${PORTSDIR}/math/gsl
 .else
-IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
+IGNORE =	unknown value of WITH_BLAS: ${WITH_BLAS}
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
@@ -93,8 +95,8 @@ post-patch:
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 post-install:
-	@${TOUCH} ${DOCSDIR}/fflas-ffpack-dev-html/.keep-me
-
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/fflas-ffpack-dev-html
+	${TOUCH} ${STAGEDIR}${DOCSDIR}/fflas-ffpack-dev-html/.keep-me
 .endif
 
 .if defined(MAINTAINER_MODE)
diff --git a/math/fflas-ffpack/pkg-plist b/math/fflas-ffpack/pkg-plist
index 83429f2c5a4b..98b5c1793ebe 100644
--- a/math/fflas-ffpack/pkg-plist
+++ b/math/fflas-ffpack/pkg-plist
@@ -49,11 +49,13 @@ include/fflas-ffpack/utils/args-parser.h
 include/fflas-ffpack/utils/debug.h
 include/fflas-ffpack/utils/print-utils.h
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-dev-html/.keep-me
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/_formulas.tex
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/AUTHORS
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/COPYING
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/INSTALL
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/annotated.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/bc_s.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/bdwn.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/bib.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/bug.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/class_f_f_p_a_c_k_1_1_failure.html
@@ -63,65 +65,39 @@ include/fflas-ffpack/utils/print-utils.h
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/class_f_f_p_a_c_k_1_1_nonzero_rand_iter.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/classes.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/closed.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_33e5bcb4d579cc5c5b77bb8ff13b65ed.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_4bcbd423084e4fe4bc28865fdb98ad74.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_56573ed5fc98f581bcddf39cbf05a95b.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_841efccba690dc2e14ababdcef5f15a8.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_ba9c4b9149076dceb852a22c07ffc5d5.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_d3f38acd236d777c1fd62044ca7860ae.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_fd5b657c4b10acf6f8abc66da0c452d9.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dirs.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_3f4dc184899094e062ff9eb0d20a1f3e.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_59425e443f801f1f2fd8bbe4959a3ccf.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_832e014794b376b1901dd535076cf4f4.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_86be3aa158f17d26f4d3fd4ae825d535.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_baa9b3441ad9816cbf70b99fdc27293e.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_cbdb8362360e11eafe2fa3bc74cf0ffd.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dir_eac799a5944e2226b86d15a6d06c7d67.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/doxygen.css
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/doxygen.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/dynsections.js
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/fflas-ffpack_8h.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/fflas_8h.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ffpack_8h.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/files.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_0.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_1.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_10.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_11.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_12.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_13.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_14.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_15.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_16.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_17.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_18.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_19.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_2.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_20.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_21.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_22.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_23.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_24.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_25.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_26.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_27.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_28.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_29.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_3.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_30.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_31.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_32.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_33.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_34.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_35.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_36.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_37.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_38.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_4.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_5.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_6.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_7.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_8.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/form_9.png
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/formula.repository
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2blank.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2doc.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2folderclosed.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2folderopen.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2lastnode.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2link.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2mlastnode.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2mnode.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2node.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2plastnode.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2pnode.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2splitbar.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/ftv2vertline.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/functions.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/functions_func.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/group___unparametric_field.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/index.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/inst.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/jquery.js
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/modular-balanced-double_8h.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/modular-balanced-float_8h.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/modular-balanced-int32_8h.html
@@ -135,11 +111,13 @@ include/fflas-ffpack/utils/print-utils.h
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/namespacemembers_eval.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/namespacemembers_func.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/namespaces.html
-%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/namespacestd.html
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/nav_f.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/nav_g.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/nav_h.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/open.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/pages.html
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/sync_off.png
+%%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/sync_on.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/tab_a.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/tab_b.png
 %%DOXYGEN%%%%DOCSDIR%%/fflas-ffpack-html/tab_h.png
diff --git a/math/givaro/Makefile b/math/givaro/Makefile
index e3953eb13909..8fa27169a8ef 100644
--- a/math/givaro/Makefile
+++ b/math/givaro/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	givaro
 PORTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://forge.imag.fr/frs/download.php/133/ LOCAL/bf
 
@@ -16,9 +17,11 @@ LICENSE_PERMS=	auto-accept
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
+USES=		libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp="${LOCALBASE}"
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOXYGEN
 
@@ -26,7 +29,7 @@ OPTIONS_DEFINE=	DOXYGEN
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS +=	doxygen:${PORTSDIR}/devel/doxygen
-CONFIGURE_ARGS+=	--enable-doc --with-docdir="${DOCSDIR}"
+CONFIGURE_ARGS+=	--enable-doc --with-docdir=${DOCSDIR}
 PLIST_SUB+=	DOXYGEN=""
 .else
 PLIST_SUB+=	DOXYGEN="@comment "
@@ -47,8 +50,8 @@ post-patch:
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 post-install:
-	@${TOUCH} ${DOCSDIR}/givaro-dev-html/.keep-me
-
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/givaro-dev-html/
+	${TOUCH} ${STAGEDIR}${DOCSDIR}/givaro-dev-html/.keep-me
 .endif
 
 check regression-test test: build
diff --git a/math/givaro/pkg-plist b/math/givaro/pkg-plist
index ff1d5fe602cc..a0d655bb03a0 100644
--- a/math/givaro/pkg-plist
+++ b/math/givaro/pkg-plist
@@ -133,13 +133,14 @@ include/gmp++/gmp++_int_rand.inl
 include/gmp++/gmp++_rat.h
 include/gmp++/gmp++_rat.inl
 lib/libgivaro.a
-lib/libgivaro.la
 lib/libgivaro.so
-lib/libgivaro.so.3
+lib/libgivaro.so.0
+lib/libgivaro.so.0.3.0
 %%DOXYGEN%%%%DOCSDIR%%/givaro-dev-html/.keep-me
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/AUTHORS
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/COPYING
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/INSTALL
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/_formulas.tex
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/_g_f128_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/_g_firreducible_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/_modular_square_root_8_c.html
@@ -153,6 +154,7 @@ lib/libgivaro.so.3
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/all__field_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/annotated.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/bc_s.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/bdwn.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/bib.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/class_givaro_1_1_array_allocatort.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/class_givaro_1_1_base_timer.html
@@ -171,30 +173,30 @@ lib/libgivaro.so.3
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/class_givaro_1_1_zpz_dom_3_01_unsigned32_01_4.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/classes.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/closed.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_084a1c897cacbd39aa9c27fc335ab35c.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_0dd9ebd1474a4dc99789ba0119bdd51e.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_129c70744c0efe2b177b0af8ae1b9c7d.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_18bcae4c63913eea52c9b9a8b8ef2e72.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_3876a9c68757b7f5d5023a06a6dcf18b.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_43a8ffec82ba76903ade16fc21d9b059.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_59cfe3464a4e832ff893361042ec4649.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_6fb3cc2efa7543208ce01790775eb6cc.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_7f2047eff32efc1d0d12bb3be371891d.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_818c432af2e902c00dbfcf3a0539cdaa.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_82ed4aabf8a533ec4cfdf903a204e9cc.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_8606c389f1f7887e3a6b33a5a9955444.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_9b688714133bd523de57bcfc32012b45.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_aa54652c341438ebfd8c82ddc3908422.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_b923bbf6b3bc9545a442857464098bb2.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_bbfed1c57e99aafa8093c6d57105b87b.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_bd4c4153c00fe1f8a3f9a518adfb4264.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_d0e0e46e201fb698d6463b1dd140c679.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_e164183d68f9816d2581802bef2e2374.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_f99134fd7bd43929f343517fdce6f42e.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dirs.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_06853762e3b771dad37cd9ffdcf5a76f.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_0aacf3aed1a5c7085b23ed9486273ee2.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_19d63ea48e84e9e656741462292bb4aa.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_3a8de958573745cf964743e5b3f7ae6f.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_561c0e0604248f0444604ae9cf7c45c0.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_59425e443f801f1f2fd8bbe4959a3ccf.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_6c86514ac9651b4de1304c66e1a8bd47.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_6e91955445987a605d977a8726f728ec.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_77133a1247205623052490e805ea07de.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_916543caed20fa107fd9b47082bebf34.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_95ee355c301ccfc6f0bed57aaf17abd1.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_b7011461ce8fd18a51117dabb438e70f.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_bd706fa796d5fc4fbd8e05394c050856.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_cbd7f246bdf7dc0a50281a272327e6ed.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_cfddc3e4738eb751c9ecb1dcd81b4d56.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_d28a4824dc47e487b107a5db32ef43c4.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_d2901aef30a976160da4d12897d52c33.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_de7304dca49810a8acb63d3f86914e8f.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dir_f518930938cfcd84bbf44252662b2c18.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/domain__to__operatorstyle_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/doxygen.css
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/doxygen.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/dynsections.js
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/examples.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/examples_2_finite_field_2_g_f128_8_c-example.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/examples_2_finite_field_2_g_firreducible_8_c-example.html
@@ -244,38 +246,33 @@ lib/libgivaro.so.3
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/exponentiation_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/ff__arith_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/files.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_0.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_1.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_10.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_11.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_12.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_13.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_14.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_15.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_16.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_2.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_3.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_4.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_5.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_6.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_7.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_8.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/form_9.png
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/formula.repository
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2blank.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2doc.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2folderclosed.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2folderopen.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2lastnode.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2link.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2mlastnode.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2mnode.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2node.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2plastnode.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2pnode.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2splitbar.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/ftv2vertline.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x63.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x64.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x65.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x67.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x69.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x6d.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x6e.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x6f.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x72.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x73.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x76.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x7a.html
-%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_0x7e.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_c.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_d.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_e.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_g.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_i.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_m.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_n.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_o.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_r.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_s.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_v.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_z.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_~.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_func.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_rela.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/functions_type.html
@@ -321,6 +318,7 @@ lib/libgivaro.so.3
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/ispower_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/isprimitive_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/isproot_8_c.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/jquery.js
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/lambda_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/lambda__inv_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/modules.html
@@ -329,6 +327,7 @@ lib/libgivaro.so.3
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/namespacemembers_func.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/namespaces.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/nav_f.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/nav_g.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/nav_h.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/nb__primes_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/nextprime_8_c.html
@@ -344,6 +343,8 @@ lib/libgivaro.so.3
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/primitiveelement_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/primitiveroot_8_c.html
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/probable__primroot_8_c.html
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/sync_off.png
+%%DOXYGEN%%%%DOCSDIR%%/givaro-html/sync_on.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/tab_a.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/tab_b.png
 %%DOXYGEN%%%%DOCSDIR%%/givaro-html/tab_h.png
diff --git a/net/nmsg/Makefile b/net/nmsg/Makefile
index 8779f5ff283e..621f1e60dc02 100644
--- a/net/nmsg/Makefile
+++ b/net/nmsg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	nmsg
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 # DISTNAME=	${PORTNAME}-${PORTVERSION}
 CATEGORIES=	net
 MASTER_SITES=	https://dl.farsightsecurity.com/dist/nmsg/
diff --git a/net/nmsg/pkg-plist b/net/nmsg/pkg-plist
index 48404a5a5c60..ef807e8ce073 100644
--- a/net/nmsg/pkg-plist
+++ b/net/nmsg/pkg-plist
@@ -103,7 +103,6 @@ share/nmsg/base/xml.proto
 %%PORTDOCS%%%%DOCSDIR%%/html/encode_8pb-c_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2cl.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2doc.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderclosed.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderopen.png
@@ -111,9 +110,7 @@ share/nmsg/base/xml.proto
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2link.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2mlastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ftv2ns.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2plastnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2pnode.png
 %%PORTDOCS%%%%DOCSDIR%%/html/ftv2splitbar.png