svn commit: r370206 - in head/textproc: . libwpd libwpd010

[Baptiste Daroussin]

Author: bapt
Date: Mon Oct  6 19:01:17 2014
New Revision: 370206
URL: https://svnweb.freebsd.org/changeset/ports/370206
QAT: https://qat.redports.org/buildarchive/r370206/

Log:
  Import libwpd010
  Make sure libwpd is not conflicting with libwpd010 by not installing the tools

Added:
  head/textproc/libwpd010/
     - copied from r370181, head/textproc/libwpd/
Modified:
  head/textproc/Makefile
  head/textproc/libwpd/Makefile
  head/textproc/libwpd/pkg-plist
  head/textproc/libwpd010/Makefile
  head/textproc/libwpd010/distinfo
  head/textproc/libwpd010/pkg-plist

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Mon Oct  6 18:50:19 2014	(r370205)
+++ head/textproc/Makefile	Mon Oct  6 19:01:17 2014	(r370206)
@@ -381,6 +381,7 @@
     SUBDIR += libuninameslist
     SUBDIR += libvisio
     SUBDIR += libwpd
+    SUBDIR += libwpd010
     SUBDIR += libwps
     SUBDIR += libxdiff
     SUBDIR += libxml++26

Modified: head/textproc/libwpd/Makefile
==============================================================================
--- head/textproc/libwpd/Makefile	Mon Oct  6 18:50:19 2014	(r370205)
+++ head/textproc/libwpd/Makefile	Mon Oct  6 19:01:17 2014	(r370206)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libwpd
 PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -22,4 +22,7 @@ INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--without-docs
 PLIST_SUB=	MAJVER=${PORTVERSION:R}
 
+post-stage:
+	@${RM} ${STAGEDIR}${PREFIX}/bin/wpd*
+
 .include <bsd.port.mk>

Modified: head/textproc/libwpd/pkg-plist
==============================================================================
--- head/textproc/libwpd/pkg-plist	Mon Oct  6 18:50:19 2014	(r370205)
+++ head/textproc/libwpd/pkg-plist	Mon Oct  6 19:01:17 2014	(r370206)
@@ -1,6 +1,3 @@
-bin/wpd2html
-bin/wpd2raw
-bin/wpd2text
 include/libwpd-%%MAJVER%%/libwpd/WPDocument.h
 include/libwpd-%%MAJVER%%/libwpd/WPXBinaryData.h
 include/libwpd-%%MAJVER%%/libwpd/WPXDocumentInterface.h
@@ -22,6 +19,3 @@ lib/libwpd-stream-%%MAJVER%%.so.9
 lib/libwpd-stream-%%MAJVER%%.so.9.0.9
 libdata/pkgconfig/libwpd-%%MAJVER%%.pc
 libdata/pkgconfig/libwpd-stream-%%MAJVER%%.pc
- at dirrm include/libwpd-%%MAJVER%%/libwpd-stream
- at dirrm include/libwpd-%%MAJVER%%/libwpd
- at dirrm include/libwpd-%%MAJVER%%

Modified: head/textproc/libwpd010/Makefile
==============================================================================
--- head/textproc/libwpd/Makefile	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libwpd010/Makefile	Mon Oct  6 19:01:17 2014	(r370206)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libwpd
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	0.10.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -13,6 +12,8 @@ COMMENT=	Tools for importing and exporti
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
+LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+
 USES=		pathfix libtool:keepla tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	libgsf

Modified: head/textproc/libwpd010/distinfo
==============================================================================
--- head/textproc/libwpd/distinfo	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libwpd010/distinfo	Mon Oct  6 19:01:17 2014	(r370206)
@@ -1,2 +1,2 @@
-SHA256 (libwpd-0.9.9.tar.bz2) = 210c216bbbf67603f891373362ec0427aeb36bfcaf881d43433db85ca2160d7c
-SIZE (libwpd-0.9.9.tar.bz2) = 684918
+SHA256 (libwpd-0.10.0.tar.bz2) = f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91
+SIZE (libwpd-0.10.0.tar.bz2) = 632272

Modified: head/textproc/libwpd010/pkg-plist
==============================================================================
--- head/textproc/libwpd/pkg-plist	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libwpd010/pkg-plist	Mon Oct  6 19:01:17 2014	(r370206)
@@ -2,26 +2,11 @@ bin/wpd2html
 bin/wpd2raw
 bin/wpd2text
 include/libwpd-%%MAJVER%%/libwpd/WPDocument.h
-include/libwpd-%%MAJVER%%/libwpd/WPXBinaryData.h
-include/libwpd-%%MAJVER%%/libwpd/WPXDocumentInterface.h
-include/libwpd-%%MAJVER%%/libwpd/WPXProperty.h
-include/libwpd-%%MAJVER%%/libwpd/WPXPropertyList.h
-include/libwpd-%%MAJVER%%/libwpd/WPXPropertyListVector.h
-include/libwpd-%%MAJVER%%/libwpd/WPXString.h
 include/libwpd-%%MAJVER%%/libwpd/libwpd.h
-include/libwpd-%%MAJVER%%/libwpd-stream/WPXStream.h
-include/libwpd-%%MAJVER%%/libwpd-stream/WPXStreamImplementation.h
-include/libwpd-%%MAJVER%%/libwpd-stream/libwpd-stream.h
 lib/libwpd-%%MAJVER%%.la
 lib/libwpd-%%MAJVER%%.so
-lib/libwpd-%%MAJVER%%.so.9
-lib/libwpd-%%MAJVER%%.so.9.0.9
-lib/libwpd-stream-%%MAJVER%%.la
-lib/libwpd-stream-%%MAJVER%%.so
-lib/libwpd-stream-%%MAJVER%%.so.9
-lib/libwpd-stream-%%MAJVER%%.so.9.0.9
+lib/libwpd-%%MAJVER%%.so.10
+lib/libwpd-%%MAJVER%%.so.10.0.0
 libdata/pkgconfig/libwpd-%%MAJVER%%.pc
-libdata/pkgconfig/libwpd-stream-%%MAJVER%%.pc
- at dirrm include/libwpd-%%MAJVER%%/libwpd-stream
 @dirrm include/libwpd-%%MAJVER%%/libwpd
 @dirrm include/libwpd-%%MAJVER%%