7 files changed, 59 insertions, 15 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 02a17069c615..d5b8e389c9c6 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -363,6 +363,7 @@
     SUBDIR += libmrss
     SUBDIR += libmrss-php
     SUBDIR += libmwaw
+    SUBDIR += libmwaw03
     SUBDIR += libnxml
     SUBDIR += libodfgen
     SUBDIR += libparsifal
diff --git a/textproc/libmwaw/Makefile b/textproc/libmwaw/Makefile
index fd08f8b40aa7..a821bfb69f1d 100644
--- a/textproc/libmwaw/Makefile
+++ b/textproc/libmwaw/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libmwaw
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -14,9 +15,7 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd \
 		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg
 
-OPTIONS_DEFINE=	DOCS
-
-CONFIGURE_ARGS=	--disable-werror
+CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 EXTRA_PATCHES+=	${FILESDIR}/0001-use-correct-type.patch:-p1
@@ -26,10 +25,6 @@ USES=		compiler:features libtool:keepla pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-PORTDOCS=	*
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-DOCS_CONFIGURE_OFF=	--without-docs
-
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_FEATURES:Mlibc++}
@@ -40,4 +35,7 @@ CONFIGURE_ARGS+=	--with-sharedptr=boost
 EXTRA_PATCHES+=	${FILESDIR}/0001-std-isfinite-is-C-11.patch:-p1
 .endif
 
+post-stage:
+	@${RM} -f ${STAGEDIR}${PREFIX}/bin/mwaw*
+
 .include <bsd.port.post.mk>
diff --git a/textproc/libmwaw/pkg-plist b/textproc/libmwaw/pkg-plist
index 87b8f96725b0..beac185bf6f1 100644
--- a/textproc/libmwaw/pkg-plist
+++ b/textproc/libmwaw/pkg-plist
@@ -1,9 +1,3 @@
-bin/mwaw2csv
-bin/mwaw2html
-bin/mwaw2raw
-bin/mwaw2text
-bin/mwawFile
-bin/mwawZip
 include/libmwaw-0.2/libmwaw/MWAWDocument.hxx
 include/libmwaw-0.2/libmwaw/libmwaw.hxx
 lib/libmwaw-0.2.la
@@ -11,5 +5,3 @@ lib/libmwaw-0.2.so
 lib/libmwaw-0.2.so.2
 lib/libmwaw-0.2.so.2.0.0
 libdata/pkgconfig/libmwaw-0.2.pc
-@dirrm include/libmwaw-0.2/libmwaw
-@dirrm include/libmwaw-0.2
diff --git a/textproc/libmwaw03/Makefile b/textproc/libmwaw03/Makefile
new file mode 100644
index 000000000000..31b12dce638c
--- /dev/null
+++ b/textproc/libmwaw03/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	libmwaw
+PORTVERSION=	0.3.2
+CATEGORIES=	textproc
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	03
+
+MAINTAINER=	office@FreeBSD.org
+COMMENT=	Import library for some old mac text documents
+
+LICENSE=	LGPL21 MPL
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+
+CONFIGURE_ARGS=	--disable-werror --without-docs
+CPPFLAGS+=	-I${LOCALBASE}/include
+
+GNU_CONFIGURE=	yes
+USES=		compiler:features libtool pathfix pkgconfig tar:xz
+USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_FEATURES:Mlibc++}
+CONFIGURE_ARGS+=	--with-sharedptr=c++11
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+CONFIGURE_ARGS+=	--with-sharedptr=boost
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/libmwaw03/distinfo b/textproc/libmwaw03/distinfo
new file mode 100644
index 000000000000..e543e9716094
--- /dev/null
+++ b/textproc/libmwaw03/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libmwaw-0.3.2.tar.xz) = d8360a8d6f078b5cce45815a7f90fbc163a3778205f8c9601b0e212244ea8556
+SIZE (libmwaw-0.3.2.tar.xz) = 940368
diff --git a/textproc/libmwaw03/pkg-descr b/textproc/libmwaw03/pkg-descr
new file mode 100644
index 000000000000..6852e171e537
--- /dev/null
+++ b/textproc/libmwaw03/pkg-descr
@@ -0,0 +1,4 @@
+libmwaw contains some import filters for old Macintosh text documents
+(MacWrite, ClarisWorks, ... ) and some spreadsheet documents.
+
+WWW: http://libmwaw.sourceforge.net/
diff --git a/textproc/libmwaw03/pkg-plist b/textproc/libmwaw03/pkg-plist
new file mode 100644
index 000000000000..4c68367b6675
--- /dev/null
+++ b/textproc/libmwaw03/pkg-plist
@@ -0,0 +1,13 @@
+bin/mwaw2csv
+bin/mwaw2html
+bin/mwaw2raw
+bin/mwaw2svg
+bin/mwaw2text
+bin/mwawFile
+bin/mwawZip
+include/libmwaw-0.3/libmwaw/MWAWDocument.hxx
+include/libmwaw-0.3/libmwaw/libmwaw.hxx
+lib/libmwaw-0.3.so
+lib/libmwaw-0.3.so.3
+lib/libmwaw-0.3.so.3.0.2
+libdata/pkgconfig/libmwaw-0.3.pc