Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Sep 2015 00:55:32 -0700
From:      Cy Schubert <Cy.Schubert@komquats.com>
To:        Koop Mast <kwm@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, mandree@freebsd.org
Subject:   Re: svn commit: r396836 - in head/graphics/xpdf: . files
Message-ID:  <201509150755.t8F7tWU7036144@slippy.cwsent.com>
In-Reply-To: Message from Koop Mast <kwm@FreeBSD.org> of "Sun, 13 Sep 2015 17:15:31 -0000." <201509131715.t8DHFVX7070797@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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 <jrm@ftfl.ca>
>   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/n021003l.pfb:${POR
> TSDIR}/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 <bsd.port.mk>
> 
> 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.


-- 
Cheers,
Cy Schubert <Cy.Schubert@komquats.com> or <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509150755.t8F7tWU7036144>