svn commit: r370290 - in head/textproc: libodfgen libodfgen01

Tue Oct 7 10:17:36 UTC 2014

Author: bapt
Date: Tue Oct  7 10:17:34 2014
New Revision: 370290
URL: https://svnweb.freebsd.org/changeset/ports/370290
QAT: https://qat.redports.org/buildarchive/r370290/

Log:
  Import libodfgen01
  Allow libodfgen to use c++11 shared pointed instead of boost

Added:
  head/textproc/libodfgen01/
     - copied from r370181, head/textproc/libodfgen/
Modified:
  head/textproc/libodfgen/Makefile
  head/textproc/libodfgen/pkg-plist
  head/textproc/libodfgen01/Makefile
  head/textproc/libodfgen01/distinfo
  head/textproc/libodfgen01/pkg-plist

Modified: head/textproc/libodfgen/Makefile
==============================================================================

--- head/textproc/libodfgen/Makefile	Tue Oct  7 10:15:10 2014	(r370289)
+++ head/textproc/libodfgen/Makefile	Tue Oct  7 10:17:34 2014	(r370290)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libodfgen
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -12,22 +12,25 @@ COMMENT=	Library for generating document
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	libetonyek-0.0.so:${PORTSDIR}/graphics/libetonyek \
 		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
 		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=		libtool:keepla pathfix pkgconfig tar:xz
+USES=		compiler:features libtool:keepla pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.pre.mk>
 
-PORTDOCS=	*
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-DOCS_CONFIGURE_OFF=	--without-docs
+.if ${COMPILER_FEATURES:Mlibc++}
+CONFIGURE_ARGS+=	--with-sharedptr=c++11
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+CONFIGURE_ARGS+=	--with-sharedptr=boost
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/textproc/libodfgen/pkg-plist
==============================================================================
--- head/textproc/libodfgen/pkg-plist	Tue Oct  7 10:15:10 2014	(r370289)
+++ head/textproc/libodfgen/pkg-plist	Tue Oct  7 10:17:34 2014	(r370290)
@@ -8,5 +8,3 @@ lib/libodfgen-0.0.so
 lib/libodfgen-0.0.so.0
 lib/libodfgen-0.0.so.0.0.4
 libdata/pkgconfig/libodfgen-0.0.pc
- at dirrm include/libodfgen-0.0/libodfgen
- at dirrm include/libodfgen-0.0

Modified: head/textproc/libodfgen01/Makefile
==============================================================================
--- head/textproc/libodfgen/Makefile	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libodfgen01/Makefile	Tue Oct  7 10:17:34 2014	(r370290)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	libodfgen
-PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTVERSION=	0.1.1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	01
 
 MAINTAINER=	office at FreeBSD.org
 COMMENT=	Library for generating documents in Open Document Format (ODF)
@@ -12,22 +12,24 @@ COMMENT=	Library for generating document
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libetonyek-0.0.so:${PORTSDIR}/graphics/libetonyek \
-		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
-		libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
+LIB_DEPENDS=	libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
+		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
 
-OPTIONS_DEFINE=	DOCS
-
-CONFIGURE_ARGS=	--disable-werror
+CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
-USES=		libtool:keepla pathfix pkgconfig tar:xz
+USES=		compiler:features gperf libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.pre.mk>
 
-PORTDOCS=	*
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-DOCS_CONFIGURE_OFF=	--without-docs
+.if ${COMPILER_FEATURES:Mlibc++}
+CONFIGURE_ARGS+=	--with-sharedptr=c++11
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+CONFIGURE_ARGS+=	--with-sharedptr=boost
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/textproc/libodfgen01/distinfo
==============================================================================
--- head/textproc/libodfgen/distinfo	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libodfgen01/distinfo	Tue Oct  7 10:17:34 2014	(r370290)
@@ -1,2 +1,2 @@
-SHA256 (libodfgen-0.0.4.tar.xz) = 8f7a46f05417afbe957d0c3f88e375631b8651ea99bb2c231595408bc4224099
-SIZE (libodfgen-0.0.4.tar.xz) = 296224
+SHA256 (libodfgen-0.1.1.tar.xz) = 9521e2c9aa13d84799ce476e97a6549eb9de4acd190cad357d87a540452d63dc
+SIZE (libodfgen-0.1.1.tar.xz) = 325872

Modified: head/textproc/libodfgen01/pkg-plist
==============================================================================
--- head/textproc/libodfgen/pkg-plist	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/textproc/libodfgen01/pkg-plist	Tue Oct  7 10:17:34 2014	(r370290)
@@ -1,12 +1,11 @@
-include/libodfgen-0.0/libodfgen/OdfDocumentHandler.hxx
-include/libodfgen-0.0/libodfgen/OdgGenerator.hxx
-include/libodfgen-0.0/libodfgen/OdpGenerator.hxx
-include/libodfgen-0.0/libodfgen/OdtGenerator.hxx
-include/libodfgen-0.0/libodfgen/libodfgen.hxx
-lib/libodfgen-0.0.la
-lib/libodfgen-0.0.so
-lib/libodfgen-0.0.so.0
-lib/libodfgen-0.0.so.0.0.4
-libdata/pkgconfig/libodfgen-0.0.pc
- at dirrm include/libodfgen-0.0/libodfgen
- at dirrm include/libodfgen-0.0
+include/libodfgen-0.1/libodfgen/OdfDocumentHandler.hxx
+include/libodfgen-0.1/libodfgen/OdgGenerator.hxx
+include/libodfgen-0.1/libodfgen/OdpGenerator.hxx
+include/libodfgen-0.1/libodfgen/OdtGenerator.hxx
+include/libodfgen-0.1/libodfgen/libodfgen.hxx
+include/libodfgen-0.1/libodfgen/OdsGenerator.hxx
+include/libodfgen-0.1/libodfgen/libodfgen-api.hxx
+lib/libodfgen-0.1.so
+lib/libodfgen-0.1.so.1
+lib/libodfgen-0.1.so.1.0.1
+libdata/pkgconfig/libodfgen-0.1.pc
