diff --git a/app-text/libwpd/libwpd-0.9.6.recipe b/app-text/libwpd/libwpd-0.9.6.recipe
deleted file mode 100644
index 9f95286e3..000000000
--- a/app-text/libwpd/libwpd-0.9.6.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="libwpd - a library for importing WordPerfect (tm) documents"
-HOMEPAGE="libwpd.sourceforge.net"
-SRC_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.6.tar.gz?download"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building"
-CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c"
-REVISION="1"
-DEPEND="glib >= 2.0.0
-	libgsf >= 1.6.0"
-BUILD()
-{
-	cd libwpd-0.9.6
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libwpd-0.9.6
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002 William Lachance 
-	2002 Marc Maurer"
diff --git a/app-text/libwpd/libwpd-0.9.9.recipe b/app-text/libwpd/libwpd-0.9.9.recipe
new file mode 100644
index 000000000..5e2bf3fc6
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.9.9.recipe
@@ -0,0 +1,84 @@
+SUMMARY="A library for importing WordPerfect (tm) documents"
+DESCRIPTION="
+	libwpd is a C++ library designed to help process WordPerfect documents. It \
+	is most commonly used to import WordPerfect documents into other word \
+	processors (see below), but may be useful in other cases as well.
+	"
+HOMEPAGE="http://libwpd.sourceforge.net"
+SRC_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.9.tar.gz"
+LICENSE="
+	MPL v2.0
+	GNU LGPL v2.1
+	"
+COPYRIGHT="
+	William Lachance
+	Marc Maurer
+	Fridrich Strba
+	"
+REVISION="2"
+CHECKSUM_SHA256="6d894db0de312dbbef3359c14b967ee4d2bab4e70052c151f2a44dc39b0744b9"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:wpd2html$secondaryArchSuffix
+	cmd:wpd2raw$secondaryArchSuffix
+	cmd:wpd2text$secondaryArchSuffix
+	lib:libwpd_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	lib:libwpd_stream_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:awk
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libwpd-0.9 libwpd-stream-0.9
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libwpd${secondaryArchSuffix}_devel = $portVersion
+	devel:libwpd_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	devel:libwpd_stream_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"
diff --git a/app-text/libwpg/libwpg-0.2.1.recipe b/app-text/libwpg/libwpg-0.2.1.recipe
deleted file mode 100644
index 372c8b985..000000000
--- a/app-text/libwpg/libwpg-0.2.1.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="
-Libwpg project is a collection of library and tools to work with graphics in \
-WPG (WordPerfect Graphics) format.
-"
-HOMEPAGE="libwpg.sourceforge.net"
-SRC_URI="http://sourceforge.net/projects/libwpg/files/libwpg/libwpg-0.2.1/libwpg-0.2.1.tar.gz/download"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6"
-REVISION="1"
-DEPEND="pkg-config >= 0.2
-	libwpd >= 0.8"
-BUILD()
-{
-	cd libwpg-0.2.1
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-INSTALL()
-{
-	cd libwpg-0.2.1
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2007 Ariya Hidayat"
diff --git a/app-text/libwpg/libwpg-0.2.2.recipe b/app-text/libwpg/libwpg-0.2.2.recipe
new file mode 100644
index 000000000..68fd39386
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.2.2.recipe
@@ -0,0 +1,83 @@
+SUMMARY="The free WPG library, converter and viewer"
+DESCRIPTION="
+	libwpg project is a collection of library and tools to work with graphics \
+	in WPG (WordPerfect Graphics) format.
+	"
+HOMEPAGE="http://libwpg.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/libwpg/libwpg/libwpg-0.2.2/libwpg-0.2.2.tar.gz"
+LICENSE="
+	MPL v2.0
+	GNU LGPL v2.1
+	"
+COPYRIGHT="
+	Marc Oude Kotte
+	Marc Maurer
+	Ariya Hidayat
+	Fridrich Strba
+	"
+REVISION="2"
+CHECKSUM_SHA256="d5260dd46a9f2bb8ace90379b8afc47fe78f26048bb32abb982b900ef2fb2aa3"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:wpg2raw$secondaryArchSuffix
+	cmd:wpg2svg$secondaryArchSuffix
+	cmd:wpg2svgbatch.pl$secondaryArchSuffix
+	lib:libwpg_0.2$secondaryArchSuffix = 2.0.2 compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libwpd_0.9$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libwpd_0.9$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libwpg-0.2
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libwpg${secondaryArchSuffix}_devel = $portVersion
+	devel:libwpg_0.2$secondaryArchSuffix = 2.0.2 compat >= 2
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/libvisio/libvisio-0.0.31.recipe b/media-libs/libvisio/libvisio-0.0.31.recipe
new file mode 100644
index 000000000..cf57ff1e8
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.0.31.recipe
@@ -0,0 +1,101 @@
+SUMMARY="A library providing ability to interpret and import visio diagrams"
+DESCRIPTION="
+	Libvisio is library providing ability to interpret and import visio \
+	diagrams into various applications. You can find it being used in \
+	libreoffice.
+	"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio/"
+SRC_URI="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.gz"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2.1
+	MPL v1.1
+	"
+COPYRIGHT="
+	2011 Fridrich Strba
+	2011 Eilidh McAdam
+	"
+REVISION="2"
+CHECKSUM_SHA256="4805b530eb79a9817d5daa3f069ef24959f439c0c0c80f12d30f9bc67b00cf90"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:vsd2raw$secondaryArchSuffix
+	cmd:vsd2text$secondaryArchSuffix
+	cmd:vsd2xhtml$secondaryArchSuffix
+	cmd:vss2raw$secondaryArchSuffix
+	cmd:vss2text$secondaryArchSuffix
+	cmd:vss2xhtml$secondaryArchSuffix
+	lib:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	lib:libwpd_0.9$secondaryArchSuffix
+	lib:libwpg_0.2$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	boost_devel$secondaryArchSuffix >= 1.36
+	devel:libicui18n$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
+	devel:libicudata$secondaryArchSuffix
+	devel:libwpd_0.9$secondaryArchSuffix
+	devel:libwpg_0.2$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:gperf
+	cmd:icu_config$secondaryArchSuffix
+	cmd:sed
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libvisio-0.0
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libvisio${secondaryArchSuffix}_devel = $portVersion
+	devel:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"