From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 11 05:04:15 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 35974C6B;
 Thu, 11 Jul 2013 05:04:15 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 291141066;
 Thu, 11 Jul 2013 05:04:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B54EOF030313;
 Thu, 11 Jul 2013 05:04:14 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6B54E5J030311;
 Thu, 11 Jul 2013 05:04:14 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201307110504.r6B54E5J030311@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 11 Jul 2013 05:04:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322740 - head/graphics/xpdf
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.14
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: Thu, 11 Jul 2013 05:04:15 -0000

Author: cy
Date: Thu Jul 11 05:04:14 2013
New Revision: 322740
URL: http://svnweb.freebsd.org/changeset/ports/322740

Log:
  Fix man page CONFLICTS with graphics/poppler.
  
  Pointy hat to:	myself, missed in r296465.
  Pointed out by:	Jan Henrik Sylvester <me@janh.de>
  Approved by:	araujo (Maintainer)

Modified:
  head/graphics/xpdf/Makefile
  head/graphics/xpdf/pkg-plist

Modified: head/graphics/xpdf/Makefile
==============================================================================
--- head/graphics/xpdf/Makefile	Thu Jul 11 04:54:06 2013	(r322739)
+++ head/graphics/xpdf/Makefile	Thu Jul 11 05:04:14 2013	(r322740)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -21,7 +21,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-opi \
 		--with-freetype2-library="${LOCALBASE}/lib" \
 		--with-freetype2-includes="${LOCALBASE}/include/freetype2" \
-		--bindir="${PREFIX}/libexec/xpdf"
+		--bindir="${PREFIX}/libexec/xpdf" \
+		--mandir="${PREFIX}/share/xpdf/man"
+
+MANPREFIX=	${PREFIX}/share/xpdf
 
 OPTIONS_DEFINE=	LIBPAPER TYPE1 X11
 LIBPAPER_DESC=	Enable libpaper

Modified: head/graphics/xpdf/pkg-plist
==============================================================================
--- head/graphics/xpdf/pkg-plist	Thu Jul 11 04:54:06 2013	(r322739)
+++ head/graphics/xpdf/pkg-plist	Thu Jul 11 05:04:14 2013	(r322740)
@@ -13,4 +13,8 @@ etc/xpdfrc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/hello.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/xpdf/man/man5
+@dirrm share/xpdf/man/man1
+@dirrm share/xpdf/man
+@dirrm share/xpdf
 @dirrm libexec/xpdf