From owner-svn-ports-all@FreeBSD.ORG  Sat Feb  8 10:25:03 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F328B501;
 Sat,  8 Feb 2014 10:25:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF4B81DDB;
 Sat,  8 Feb 2014 10:25:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18AP2dG025854;
 Sat, 8 Feb 2014 10:25:02 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18AP2JW025853;
 Sat, 8 Feb 2014 10:25:02 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201402081025.s18AP2JW025853@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 8 Feb 2014 10:25:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343317 - 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 10:25:03 -0000

Author: kwm
Date: Sat Feb  8 10:25:02 2014
New Revision: 343317
URL: http://svnweb.freebsd.org/changeset/ports/343317
QAT: https://qat.redports.org/buildarchive/r343317/

Log:
  Only disable poppler is the option is unset, not always. This was
  overlooked when inkscape was converted to new options.
  
  PR:		ports/186528
  Reported by:	Yuri <yuri@tsoft.com>

Modified:
  head/graphics/inkscape/Makefile

Modified: head/graphics/inkscape/Makefile
==============================================================================
--- head/graphics/inkscape/Makefile	Sat Feb  8 10:06:40 2014	(r343316)
+++ head/graphics/inkscape/Makefile	Sat Feb  8 10:25:02 2014	(r343317)
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
@@ -65,7 +65,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|libpng >= 1.2|libpng15 >= 1.2|g' \
 		-e 's|-ldl||g' \
 	    	${WRKSRC}/configure
-.if !defined(WITH_POPPLER)
+.if ! ${PORT_OPTIONS:MPOPPLER}
 	@${REINPLACE_CMD} -e 's|poppler|pdisable|g' \
 		${WRKSRC}/configure
 .endif