From owner-svn-ports-all@freebsd.org  Tue Jan 26 19:00:02 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4A7FA6E533;
 Tue, 26 Jan 2016 19:00:02 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93B33E89;
 Tue, 26 Jan 2016 19:00:02 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0QJ01vG025669;
 Tue, 26 Jan 2016 19:00:01 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0QJ01eP025668;
 Tue, 26 Jan 2016 19:00:01 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601261900.u0QJ01eP025668@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 26 Jan 2016 19:00:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407289 - head/graphics/inkscape
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 19:00:02 -0000

Author: kwm
Date: Tue Jan 26 19:00:01 2016
New Revision: 407289
URL: https://svnweb.freebsd.org/changeset/ports/407289

Log:
  Switch abiword to using libwpg-0.3, which would be used if installed even.
  
  While here remove commented out lines regarding poppler.

Modified:
  head/graphics/inkscape/Makefile

Modified: head/graphics/inkscape/Makefile
==============================================================================
--- head/graphics/inkscape/Makefile	Tue Jan 26 18:56:39 2016	(r407288)
+++ head/graphics/inkscape/Makefile	Tue Jan 26 19:00:01 2016	(r407289)
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.91
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://inkscape.global.ssl.fastly.net/media/resources/file/ \
 		LOCAL/kwm
@@ -51,8 +51,6 @@ OPENMP_USES_OFF=	compiler:features
 
 POPPLER_DESC=		PDF preview rendering
 POPPLER_CONFIGURE_ENABLE=	poppler-cairo
-#POPPLER_CONFIGURE_ON=	--enable-poppler-cairo
-#POPPLER_CONFIGURE_OFF=	--enable-poppler-cairo=no
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 VISIO_DESC=		Support for Microsoft Visio diagrams
@@ -62,7 +60,7 @@ VISIO_LIB_DEPENDS=	librevenge-stream-0.0
 
 WPG_DESC=		Support for WordPerfect graphics
 WPG_CONFIGURE_ENABLE=	wpg
-WPG_LIB_DEPENDS=	libwpg-0.2.so:${PORTSDIR}/graphics/libwpg
+WPG_LIB_DEPENDS=	libwpg-0.3.so:${PORTSDIR}/graphics/libwpg03
 
 .include <bsd.port.pre.mk>
 
@@ -85,9 +83,5 @@ CXX=    ${LOCALBASE}/bin/clang++34
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 	    	${WRKSRC}/configure
-#.if ! ${PORT_OPTIONS:MPOPPLER}
-#	@${REINPLACE_CMD} -e 's|poppler|pdisable|g' \
-#		${WRKSRC}/configure
-#.endif
 
 .include <bsd.port.post.mk>