From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 25 22:06:42 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1DE5106566B;
	Tue, 25 Sep 2012 22:06:42 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDBD88FC19;
	Tue, 25 Sep 2012 22:06:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PM6gMu003462;
	Tue, 25 Sep 2012 22:06:42 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PM6gud003460;
	Tue, 25 Sep 2012 22:06:42 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201209252206.q8PM6gud003460@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 25 Sep 2012 22:06:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304864 - head/graphics/poppler
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Tue, 25 Sep 2012 22:06:43 -0000

Author: kwm
Date: Tue Sep 25 22:06:42 2012
New Revision: 304864
URL: http://svn.freebsd.org/changeset/ports/304864

Log:
  Unify poppler-config.h includes in poppler header.
  
  PR:		ports/171877
  Submitted by:	bsam@
  Obtained from:	poppler upstream, Bug 52193

Modified:
  head/graphics/poppler/Makefile

Modified: head/graphics/poppler/Makefile
==============================================================================
--- head/graphics/poppler/Makefile	Tue Sep 25 21:57:13 2012	(r304863)
+++ head/graphics/poppler/Makefile	Tue Sep 25 22:06:42 2012	(r304864)
@@ -8,7 +8,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.18.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -111,6 +111,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
 		${WRKSRC}/configure
 .endif
+	# A fix for bug 52193 (fixed upstream at poppler-0.20)
+	@${REINPLACE_CMD} -e 's:poppler/poppler-config.h:poppler-config.h:' \
+		${WRKSRC}/goo/*.h ${WRKSRC}/splash/*.h
 
 post-install:
 .if defined(SLAVEPORT)