svn commit: r370285 - in head/textproc: . libmwaw libmwaw03 libmwaw03/files

[Baptiste Daroussin]

Author: bapt
Date: Tue Oct  7 10:03:15 2014
New Revision: 370285
URL: https://svnweb.freebsd.org/changeset/ports/370285
QAT: https://qat.redports.org/buildarchive/r370285/

Log:
  Import libmwaw03
  Ensure it does not conflicts with libmwaw

Added:
  head/textproc/libmwaw03/
     - copied from r370181, head/textproc/libmwaw/
Deleted:
  head/textproc/libmwaw03/files/
Modified:
  head/textproc/Makefile
  head/textproc/libmwaw/Makefile
  head/textproc/libmwaw/pkg-plist
  head/textproc/libmwaw03/Makefile
  head/textproc/libmwaw03/distinfo
  head/textproc/libmwaw03/pkg-plist

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Tue Oct  7 09:53:49 2014	(r370284)
+++ head/textproc/Makefile	Tue Oct  7 10:03:15 2014	(r370285)
@@ -363,6 +363,7 @@
     SUBDIR += libmrss
     SUBDIR += libmrss-php
     SUBDIR += libmwaw
+    SUBDIR += libmwaw03
     SUBDIR += libnxml
     SUBDIR += libodfgen
     SUBDIR += libparsifal

Modified: head/textproc/libmwaw/Makefile
==============================================================================
--- head/textproc/libmwaw/Makefile	Tue Oct  7 09:53:49 2014	(r370284)
+++ head/textproc/libmwaw/Makefile	Tue Oct  7 10:03:15 2014	(r370285)
@@ -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 
 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>

Modified: head/textproc/libmwaw/pkg-plist
==============================================================================
--- head/textproc/libmwaw/pkg-plist	Tue Oct  7 09:53:49 2014	(r370284)
+++ head/textproc/libmwaw/pkg-plist	Tue Oct  7 10:03:15 2014	(r370285)
@@ -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
- at dirrm include/libmwaw-0.2/libmwaw
- at dirrm include/libmwaw-0.2

Modified: head/textproc/libmwaw03/Makefile
==============================================================================
--- head/textproc/libmwaw/Makefile	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libmwaw03/Makefile	Tue Oct  7 10:03:15 2014	(r370285)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	libmwaw
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	03
 
 MAINTAINER=	office at FreeBSD.org
 COMMENT=	Import library for some old mac text documents
@@ -11,25 +12,16 @@ COMMENT=	Import library for some old mac
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd \
-		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg
+LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
 
-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
-
 GNU_CONFIGURE=	yes
-USES=		compiler:features libtool:keepla pathfix pkgconfig tar:xz
+USES=		compiler:features libtool 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++}
@@ -37,7 +29,6 @@ CONFIGURE_ARGS+=	--with-sharedptr=c++11
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 CONFIGURE_ARGS+=	--with-sharedptr=boost
-EXTRA_PATCHES+=	${FILESDIR}/0001-std-isfinite-is-C-11.patch:-p1
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/textproc/libmwaw03/distinfo
==============================================================================
--- head/textproc/libmwaw/distinfo	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libmwaw03/distinfo	Tue Oct  7 10:03:15 2014	(r370285)
@@ -1,2 +1,2 @@
-SHA256 (libmwaw-0.2.0.tar.xz) = c30f228681ba2fc3715c9e41fcf2c3bb2b873911acb22602ab7b2eb1eeed85bd
-SIZE (libmwaw-0.2.0.tar.xz) = 808604
+SHA256 (libmwaw-0.3.2.tar.xz) = d8360a8d6f078b5cce45815a7f90fbc163a3778205f8c9601b0e212244ea8556
+SIZE (libmwaw-0.3.2.tar.xz) = 940368

Modified: head/textproc/libmwaw03/pkg-plist
==============================================================================
--- head/textproc/libmwaw/pkg-plist	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libmwaw03/pkg-plist	Tue Oct  7 10:03:15 2014	(r370285)
@@ -1,15 +1,13 @@
 bin/mwaw2csv
 bin/mwaw2html
 bin/mwaw2raw
+bin/mwaw2svg
 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
-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
- at dirrm include/libmwaw-0.2/libmwaw
- at dirrm include/libmwaw-0.2
+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