From owner-svn-ports-all@freebsd.org Tue Sep 15 10:55:36 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 386F8A03668; Tue, 15 Sep 2015 10:55:36 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from fep25.mx.upcmail.net (fep25.mx.upcmail.net [62.179.121.45]) by mx1.freebsd.org (Postfix) with ESMTP id D2EDE1291; Tue, 15 Sep 2015 10:55:33 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep17-int.chello.at (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP id <20150915105245.YXM14677.viefep17-int.chello.at@edge03.upcmail.net>; Tue, 15 Sep 2015 12:52:45 +0200 Received: from [192.168.0.41] ([178.84.134.112]) by edge03.upcmail.net with edge id HNuN1r0242Rg3Ey01NuNrw; Tue, 15 Sep 2015 12:54:23 +0200 X-SourceIP: 178.84.134.112 Message-ID: <1442314408.1243.0.camel@rainbow-runner.nl> Subject: Re: svn commit: r396836 - in head/graphics/xpdf: . files From: Koop Mast To: Cy Schubert , Koop Mast Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, mandree@freebsd.org Date: Tue, 15 Sep 2015 12:53:28 +0200 In-Reply-To: <201509150755.t8F7tWU7036144@slippy.cwsent.com> References: <201509150755.t8F7tWU7036144@slippy.cwsent.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit 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: Tue, 15 Sep 2015 10:55:36 -0000 On Tue, 2015-09-15 at 00:55 -0700, Cy Schubert wrote: > In message <201509131715.t8DHFVX7070797@repo.freebsd.org>, Koop Mast > writes: > > 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 > > (r39683 > > 5) > > +++ head/graphics/xpdf/Makefile Sun Sep 13 17:15:30 2015 > > (r39683 > > 6) > > @@ -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/n02 > > 1003l.pfb:${POR > > TSDIR}/print/gsfonts > > > > LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpape > > r > > @@ -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 > > Thanks kwm. > > You forgot to make sure pkg-plist was updated too. > > Thanks mandree, it's been fixed now. > > Sorry about that, thanks for correcting it. -Koop