From owner-svn-ports-all@freebsd.org Sun Sep 13 17:15:31 2015 Return-Path: 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 C7D67A03CFA; Sun, 13 Sep 2015 17:15:31 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 B8C901FD3; Sun, 13 Sep 2015 17:15:31 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8DHFVCP070799; Sun, 13 Sep 2015 17:15:31 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8DHFVX7070797; Sun, 13 Sep 2015 17:15:31 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201509131715.t8DHFVX7070797@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 13 Sep 2015 17:15:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396836 - in head/graphics/xpdf: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2015 17:15:31 -0000 Author: kwm Date: Sun Sep 13 17:15:30 2015 New Revision: 396836 URL: https://svnweb.freebsd.org/changeset/ports/396836 Log: Add a man config file, to point to the custom location where xpdf puts the man pages. This is done to avoid a conflict with poppler-utils. If both are installed, the poppler-utils man pages are prefered. PR: 202231 Submitted by: Joseph Mingrone Approved by: maintainer timeout (14 days) Added: head/graphics/xpdf/files/xpdf-man.conf.in (contents, props changed) Modified: head/graphics/xpdf/Makefile Modified: head/graphics/xpdf/Makefile ============================================================================== --- head/graphics/xpdf/Makefile Sun Sep 13 17:05:49 2015 (r396835) +++ head/graphics/xpdf/Makefile Sun Sep 13 17:15:30 2015 (r396836) @@ -2,7 +2,7 @@ PORTNAME= xpdf PORTVERSION= 3.04 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics print MASTER_SITES= http://mirrors.rit.edu/zi/ \ ftp://ftp.foolabs.com/pub/xpdf/ \ @@ -37,6 +37,8 @@ TYPE1_DESC= Ghostscript type1 fonts OPTIONS_DEFAULT= TYPE1 X11 OPTIONS_SUB= yes +SUB_FILES= xpdf-man.conf + TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper @@ -61,5 +63,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor ${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf + ${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \ + ${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf .include Added: head/graphics/xpdf/files/xpdf-man.conf.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xpdf/files/xpdf-man.conf.in Sun Sep 13 17:15:30 2015 (r396836) @@ -0,0 +1 @@ +MANPATH %%PREFIX%%/share/xpdf/man