svn commit: r312739 - in head: print/libmspub print/libmspub/files textproc textproc/libmspub

[Jung-uk Kim]

Author: jkim
Date: Thu Feb 21 21:19:30 2013
New Revision: 312739
URL: http://svnweb.freebsd.org/changeset/ports/312739

Log:
  Remove textproc/libmspub and merge it with print/libmspub.
  
  Pointyhat to:	jkim

Deleted:
  head/print/libmspub/files/
  head/textproc/libmspub/
Modified:
  head/print/libmspub/Makefile
  head/print/libmspub/distinfo
  head/print/libmspub/pkg-descr
  head/print/libmspub/pkg-plist
  head/textproc/Makefile

Modified: head/print/libmspub/Makefile
==============================================================================
--- head/print/libmspub/Makefile	Thu Feb 21 21:07:14 2013	(r312738)
+++ head/print/libmspub/Makefile	Thu Feb 21 21:19:30 2013	(r312739)
@@ -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 at 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>

Modified: head/print/libmspub/distinfo
==============================================================================
--- head/print/libmspub/distinfo	Thu Feb 21 21:07:14 2013	(r312738)
+++ head/print/libmspub/distinfo	Thu Feb 21 21:19:30 2013	(r312739)
@@ -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

Modified: head/print/libmspub/pkg-descr
==============================================================================
--- head/print/libmspub/pkg-descr	Thu Feb 21 21:07:14 2013	(r312738)
+++ head/print/libmspub/pkg-descr	Thu Feb 21 21:19:30 2013	(r312739)
@@ -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/

Modified: head/print/libmspub/pkg-plist
==============================================================================
--- head/print/libmspub/pkg-plist	Thu Feb 21 21:07:14 2013	(r312738)
+++ head/print/libmspub/pkg-plist	Thu Feb 21 21:19:30 2013	(r312739)
@@ -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
+ at dirrm include/libmspub-0.0/libmspub
+ at dirrm include/libmspub-0.0

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Thu Feb 21 21:07:14 2013	(r312738)
+++ head/textproc/Makefile	Thu Feb 21 21:19:30 2013	(r312739)
@@ -373,7 +373,6 @@
     SUBDIR += liblrdf
     SUBDIR += libmrss
     SUBDIR += libmrss-php
-    SUBDIR += libmspub
     SUBDIR += libnxml
     SUBDIR += libparsifal
     SUBDIR += libroxml