svn commit: r370213 - in head/graphics: . libwpg libwpg03

[Baptiste Daroussin]

Author: bapt
Date: Mon Oct  6 19:20:24 2014
New Revision: 370213
URL: https://svnweb.freebsd.org/changeset/ports/370213
QAT: https://qat.redports.org/buildarchive/r370213/

Log:
  Import libwpg03
  Make sure that libwpg is not conflicting with libwpg03

Added:
  head/graphics/libwpg03/
     - copied from r370181, head/graphics/libwpg/
Modified:
  head/graphics/Makefile
  head/graphics/libwpg/Makefile
  head/graphics/libwpg/pkg-plist
  head/graphics/libwpg03/Makefile
  head/graphics/libwpg03/distinfo
  head/graphics/libwpg03/pkg-plist

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Mon Oct  6 19:17:22 2014	(r370212)
+++ head/graphics/Makefile	Mon Oct  6 19:20:24 2014	(r370213)
@@ -543,6 +543,7 @@
     SUBDIR += libwmf
     SUBDIR += libwmf-nox11
     SUBDIR += libwpg
+    SUBDIR += libwpg03
     SUBDIR += linplasma
     SUBDIR += linux-XnViewMP
     SUBDIR += linux-adobesvg

Modified: head/graphics/libwpg/Makefile
==============================================================================
--- head/graphics/libwpg/Makefile	Mon Oct  6 19:17:22 2014	(r370212)
+++ head/graphics/libwpg/Makefile	Mon Oct  6 19:20:24 2014	(r370213)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libwpg
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -19,11 +19,9 @@ SHEBANG_FILES=	${WRKSRC}/src/conv/svg/wp
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--disable-werror
+CONFIGURE_ARGS=	--disable-werror --without-docs
 
-OPTIONS_DEFINE=	DOCS
-
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-PORTDOCS=	*
+post-stage:
+	@${RM} ${STAGEDIR}${PREFIX}/bin/wp*
 
 .include <bsd.port.mk>

Modified: head/graphics/libwpg/pkg-plist
==============================================================================
--- head/graphics/libwpg/pkg-plist	Mon Oct  6 19:17:22 2014	(r370212)
+++ head/graphics/libwpg/pkg-plist	Mon Oct  6 19:20:24 2014	(r370213)
@@ -1,6 +1,3 @@
-bin/wpg2raw
-bin/wpg2svg
-bin/wpg2svgbatch.pl
 include/libwpg-0.2/libwpg/WPGPaintInterface.h
 include/libwpg-0.2/libwpg/WPGraphics.h
 include/libwpg-0.2/libwpg/libwpg.h
@@ -10,5 +7,3 @@ lib/libwpg-0.2.so
 lib/libwpg-0.2.so.2
 lib/libwpg-0.2.so.2.0.2
 libdata/pkgconfig/libwpg-0.2.pc
- at dirrm include/libwpg-0.2/libwpg
- at dirrm include/libwpg-0.2

Modified: head/graphics/libwpg03/Makefile
==============================================================================
--- head/graphics/libwpg/Makefile	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/graphics/libwpg03/Makefile	Mon Oct  6 19:20:24 2014	(r370213)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	libwpg
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTVERSION=	0.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	03
 
 MAINTAINER=	office at FreeBSD.org
 COMMENT=	Library and tools to work with WordPerfect Graphics (WPG) files
@@ -12,18 +12,14 @@ COMMENT=	Library and tools to work with 
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
+LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge \
+		libwpd-0.10.so:${PORTSDIR}/textproc/libwpd010
 
-USES=		libtool:keepla pathfix perl5 pkgconfig shebangfix tar:bzip2
+USES=		libtool pathfix perl5 pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/src/conv/svg/wpg2svgbatch.pl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--disable-werror
-
-OPTIONS_DEFINE=	DOCS
-
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-PORTDOCS=	*
+CONFIGURE_ARGS=	--disable-werror --without-docs
 
 .include <bsd.port.mk>

Modified: head/graphics/libwpg03/distinfo
==============================================================================
--- head/graphics/libwpg/distinfo	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/graphics/libwpg03/distinfo	Mon Oct  6 19:20:24 2014	(r370213)
@@ -1,2 +1,2 @@
-SHA256 (libwpg-0.2.2.tar.bz2) = ccb8907bdd78e2a094204a745431d6bcfdba475354ed3caba36aaea6c9d88626
-SIZE (libwpg-0.2.2.tar.bz2) = 376802
+SHA256 (libwpg-0.3.0.tar.bz2) = 28fc3580228a82948dfc01d07abd5076c8b0df76a68702c1a81eb88fdf377348
+SIZE (libwpg-0.3.0.tar.bz2) = 381878

Modified: head/graphics/libwpg03/pkg-plist
==============================================================================
--- head/graphics/libwpg/pkg-plist	Mon Oct  6 14:00:58 2014	(r370181)
+++ head/graphics/libwpg03/pkg-plist	Mon Oct  6 19:20:24 2014	(r370213)
@@ -1,14 +1,9 @@
 bin/wpg2raw
 bin/wpg2svg
 bin/wpg2svgbatch.pl
-include/libwpg-0.2/libwpg/WPGPaintInterface.h
-include/libwpg-0.2/libwpg/WPGraphics.h
-include/libwpg-0.2/libwpg/libwpg.h
-lib/libwpg-0.2.a
-lib/libwpg-0.2.la
-lib/libwpg-0.2.so
-lib/libwpg-0.2.so.2
-lib/libwpg-0.2.so.2.0.2
-libdata/pkgconfig/libwpg-0.2.pc
- at dirrm include/libwpg-0.2/libwpg
- at dirrm include/libwpg-0.2
+include/libwpg-0.3/libwpg/WPGraphics.h
+include/libwpg-0.3/libwpg/libwpg.h
+lib/libwpg-0.3.so
+lib/libwpg-0.3.so.3
+lib/libwpg-0.3.so.3.0.0
+libdata/pkgconfig/libwpg-0.3.pc