Remove textproc/libmspub and merge it with print/libmspub.

Pointyhat to:	jkim

5 files changed, 16 insertions, 33 deletions

diff --git a/print/libmspub/Makefile b/print/libmspub/Makefile
index f98dcf901eaf..11a5d7c2d628 100644
--- a/print/libmspub/Makefile
+++ b/print/libmspub/Makefile
@@ -1,26 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	libmspub
-PORTVERSION=	0.0.3
+PORTVERSION=	0.0.5
 CATEGORIES=	print graphics devel
 MASTER_SITES=	http://dev-www.libreoffice.org/src/
 
 MAINTAINER=	office@FreeBSD.org
-COMMENT=	Library providing ability to interpret and import Microsoft Publisher content
+COMMENT=	Library and tools for parsing Microsoft Publisher file format
 
 LICENSE=	LGPL21 MPL GPLv2
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	wpd-0.9:${PORTSDIR}/textproc/libwpd \
-		wpg-0.2:${PORTSDIR}/graphics/libwpg
+LIB_DEPENDS=	icui18n:${PORTSDIR}/devel/icu \
+		wpg-0.2:${PORTSDIR}/graphics/libwpg \
+		wpd-0.9:${PORTSDIR}/textproc/libwpd
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-USE_XZ=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-werror
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	build
+USE_XZ=		yes
+
+CONFIGURE_ARGS=	--disable-werror --without-docs
+CONFIGURE_ENV=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/print/libmspub/distinfo b/print/libmspub/distinfo
index 5239e308e1de..05bf364dbf0c 100644
--- a/print/libmspub/distinfo
+++ b/print/libmspub/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmspub-0.0.3.tar.xz) = e27c3021006080298357101a724563c23835c89757527217fb7f9357549ab15f
-SIZE (libmspub-0.0.3.tar.xz) = 339552
+SHA256 (libmspub-0.0.5.tar.xz) = 8ba71b640787d6b71337e2955d6fd10a11d8ca869359e03623193bf4f56e91ab
+SIZE (libmspub-0.0.5.tar.xz) = 349232
diff --git a/print/libmspub/files/patch-src__lib__MSPUBParser.cpp b/print/libmspub/files/patch-src__lib__MSPUBParser.cpp
deleted file mode 100644
index 144d5604d1cb..000000000000
--- a/print/libmspub/files/patch-src__lib__MSPUBParser.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/lib/MSPUBParser.cpp.orig	2012-08-21 11:40:41.000000000 +0200
-+++ ./src/lib/MSPUBParser.cpp	2012-12-18 13:01:33.120360905 +0100
-@@ -1151,7 +1151,7 @@
-   ParagraphStyle ret;
- 
-   bool isList = false;
--  uint32_t bulletChar = '\u0000';
-+  uint32_t bulletChar = 0;
-   NumberingType numberingType = STANDARD_WESTERN;
-   NumberingDelimiter numberingDelimiter = NO_DELIMITER;
-   boost::optional<unsigned> numberIfRestarted;
-@@ -1256,7 +1256,7 @@
-   }
-   if (isList)
-   {
--    if (bulletChar != '\u0000')
-+    if (bulletChar)
-     {
-       ret.m_listInfo = ListInfo(bulletChar);
-     }
diff --git a/print/libmspub/pkg-descr b/print/libmspub/pkg-descr
index 0304c1220023..64c9a0c71933 100644
--- a/print/libmspub/pkg-descr
+++ b/print/libmspub/pkg-descr
@@ -1,4 +1,4 @@
-library and tools providing ability to interpret and import Microsoft Publisher
-content into various applications
+Libmspub is library providing ability to interpret and import Microsoft
+Publisher content into various applications.
 
 WWW: http://www.freedesktop.org/wiki/Software/libmspub/
diff --git a/print/libmspub/pkg-plist b/print/libmspub/pkg-plist
index cbf830551934..0356a2d03855 100644
--- a/print/libmspub/pkg-plist
+++ b/print/libmspub/pkg-plist
@@ -1,7 +1,5 @@
 bin/pub2raw
 bin/pub2xhtml
-include/libmspub-0.0
-include/libmspub-0.0/libmspub
 include/libmspub-0.0/libmspub/MSPUBDocument.h
 include/libmspub-0.0/libmspub/MSPUBStringVector.h
 include/libmspub-0.0/libmspub/libmspub.h
@@ -10,3 +8,5 @@ lib/libmspub-0.0.la
 lib/libmspub-0.0.so
 lib/libmspub-0.0.so.0
 libdata/pkgconfig/libmspub-0.0.pc
+@dirrm include/libmspub-0.0/libmspub
+@dirrm include/libmspub-0.0