svn commit: r370210 - in head/textproc: . libwps libwps03

[Baptiste Daroussin]

Author: bapt
Date: Mon Oct  6 19:09:37 2014
New Revision: 370210
URL: https://svnweb.freebsd.org/changeset/ports/370210
QAT: https://qat.redports.org/buildarchive/r370210/

Log:
  Import libwps03
  Ensure libwps does not conflict with libwps03

Added:
  head/textproc/libwps03/
     - copied from r370181, head/textproc/libwps/
Modified:
  head/textproc/Makefile
  head/textproc/libwps/Makefile
  head/textproc/libwps/pkg-plist
  head/textproc/libwps03/Makefile
  head/textproc/libwps03/distinfo
  head/textproc/libwps03/pkg-plist

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Mon Oct  6 19:09:34 2014	(r370209)
+++ head/textproc/Makefile	Mon Oct  6 19:09:37 2014	(r370210)
@@ -383,6 +383,7 @@
     SUBDIR += libwpd
     SUBDIR += libwpd010
     SUBDIR += libwps
+    SUBDIR += libwps03
     SUBDIR += libxdiff
     SUBDIR += libxml++26
     SUBDIR += libxml++26-reference

Modified: head/textproc/libwps/Makefile
==============================================================================
--- head/textproc/libwps/Makefile	Mon Oct  6 19:09:34 2014	(r370209)
+++ head/textproc/libwps/Makefile	Mon Oct  6 19:09:37 2014	(r370210)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libwps
 PORTVERSION=	0.2.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -15,17 +15,12 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
 
-OPTIONS_DEFINE=	DOCS
-
-CONFIGURE_ARGS=	--disable-werror
+CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 USES=		compiler:features libtool:keepla pathfix pkgconfig
 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>
 
@@ -36,4 +31,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/boo
 CONFIGURE_ARGS+=	--with-sharedptr=boost
 .endif
 
+post-stage:
+	@${RM} -f ${STAGEDIR}${PREFIX}/bin/*
+
 .include <bsd.port.post.mk>

Modified: head/textproc/libwps/pkg-plist
==============================================================================
--- head/textproc/libwps/pkg-plist	Mon Oct  6 19:09:34 2014	(r370209)
+++ head/textproc/libwps/pkg-plist	Mon Oct  6 19:09:37 2014	(r370210)
@@ -1,6 +1,3 @@
-bin/wps2html
-bin/wps2raw
-bin/wps2text
 include/libwps-0.2/libwps/WPSDocument.h
 include/libwps-0.2/libwps/libwps.h
 lib/libwps-0.2.la
@@ -8,5 +5,3 @@ lib/libwps-0.2.so
 lib/libwps-0.2.so.2
 lib/libwps-0.2.so.2.0.9
 libdata/pkgconfig/libwps-0.2.pc
- at dirrm include/libwps-0.2/libwps
- at dirrm include/libwps-0.2

Modified: head/textproc/libwps03/Makefile
==============================================================================
--- head/textproc/libwps/Makefile	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libwps03/Makefile	Mon Oct  6 19:09:37 2014	(r370210)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libwps
-PORTVERSION=	0.2.9
-PORTREVISION=	2
+PORTVERSION=	0.3.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	03
 
 MAINTAINER=	office at FreeBSD.org
 COMMENT=	Microsoft file word processor format import filter library
@@ -13,19 +13,15 @@ COMMENT=	Microsoft file word processor f
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
-
-OPTIONS_DEFINE=	DOCS
+LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USES=		compiler:features libtool:keepla pathfix pkgconfig
+CONFIGURE_ARGS=	--without-docs
+USES=		compiler:features libtool pathfix pkgconfig
 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>
 

Modified: head/textproc/libwps03/distinfo
==============================================================================
--- head/textproc/libwps/distinfo	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libwps03/distinfo	Mon Oct  6 19:09:37 2014	(r370210)
@@ -1,2 +1,2 @@
-SHA256 (libwps-0.2.9.tar.gz) = de57e3eb91eb1c6b9c6f1a765f943a3ac894e7575fad117a88ab7959fc29256d
-SIZE (libwps-0.2.9.tar.gz) = 615767
+SHA256 (libwps-0.3.0.tar.gz) = ec6f17caa6cd576a2851d92b4d48508d79bece4fc83b66b012e4c8026113d44a
+SIZE (libwps-0.3.0.tar.gz) = 639591

Modified: head/textproc/libwps03/pkg-plist
==============================================================================
--- head/textproc/libwps/pkg-plist	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libwps03/pkg-plist	Mon Oct  6 19:09:37 2014	(r370210)
@@ -1,12 +1,12 @@
+bin/wks2csv
+bin/wks2raw
+bin/wks2text
 bin/wps2html
 bin/wps2raw
 bin/wps2text
-include/libwps-0.2/libwps/WPSDocument.h
-include/libwps-0.2/libwps/libwps.h
-lib/libwps-0.2.la
-lib/libwps-0.2.so
-lib/libwps-0.2.so.2
-lib/libwps-0.2.so.2.0.9
-libdata/pkgconfig/libwps-0.2.pc
- at dirrm include/libwps-0.2/libwps
- at dirrm include/libwps-0.2
+include/libwps-0.3/libwps/WPSDocument.h
+include/libwps-0.3/libwps/libwps.h
+lib/libwps-0.3.so
+lib/libwps-0.3.so.3
+lib/libwps-0.3.so.3.0.0
+libdata/pkgconfig/libwps-0.3.pc