svn commit: r322740 - head/graphics/xpdf

[Cy Schubert]

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 at 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%%
+ at dirrm share/xpdf/man/man5
+ at dirrm share/xpdf/man/man1
+ at dirrm share/xpdf/man
+ at dirrm share/xpdf
 @dirrm libexec/xpdf