Date: Fri, 18 Sep 2015 05:16:36 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397216 - in head/graphics/xpdf: . files Message-ID: <201509180516.t8I5GaUX045010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Sep 18 05:16:35 2015 New Revision: 397216 URL: https://svnweb.freebsd.org/changeset/ports/397216 Log: Don't overwrite etc/xpdfrc, use @sample instead. PR: 203187 Modified: head/graphics/xpdf/Makefile head/graphics/xpdf/files/patch-Makefile.in head/graphics/xpdf/pkg-plist Modified: head/graphics/xpdf/Makefile ============================================================================== --- head/graphics/xpdf/Makefile Fri Sep 18 05:12:12 2015 (r397215) +++ head/graphics/xpdf/Makefile Fri Sep 18 05:16:35 2015 (r397216) @@ -2,7 +2,7 @@ PORTNAME= xpdf PORTVERSION= 3.04 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics print MASTER_SITES= http://mirrors.rit.edu/zi/ \ ftp://ftp.foolabs.com/pub/xpdf/ \ Modified: head/graphics/xpdf/files/patch-Makefile.in ============================================================================== --- head/graphics/xpdf/files/patch-Makefile.in Fri Sep 18 05:12:12 2015 (r397215) +++ head/graphics/xpdf/files/patch-Makefile.in Fri Sep 18 05:16:35 2015 (r397216) @@ -1,5 +1,5 @@ --- Makefile.in.orig 2014-05-28 11:50:50.000000000 -0700 -+++ Makefile.in 2015-01-20 11:21:34.614223754 -0800 ++++ Makefile.in 2015-09-17 22:04:25.442510655 -0700 @@ -89,7 +89,9 @@ $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) @@ -11,7 +11,7 @@ $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) -mkdir -p $(DESTDIR)@mandir@/man1 @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1 -@@ -98,7 +100,9 @@ +@@ -98,14 +100,16 @@ $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1 @@ -22,3 +22,11 @@ $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 -mkdir -p $(DESTDIR)@mandir@/man5 $(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5 + -mkdir -p $(DESTDIR)@sysconfdir@ + @if test ! -f $(DESTDIR)@sysconfdir@/xpdfrc; then \ + echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc"; \ +- $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc; \ ++ $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc.sample; \ + else \ + echo "# not overwriting the existing $(DESTDIR)@sysconfdir@/xpdfrc"; \ + fi Modified: head/graphics/xpdf/pkg-plist ============================================================================== --- head/graphics/xpdf/pkg-plist Fri Sep 18 05:12:12 2015 (r397215) +++ head/graphics/xpdf/pkg-plist Fri Sep 18 05:16:35 2015 (r397216) @@ -10,7 +10,6 @@ libexec/xpdf/pdftotext %%X11%%libexec/xpdf/xpdf %%X11%%bin/xpdf etc/man.d/xpdf.conf -etc/xpdfrc %%DATADIR%%/man/man1/pdfdetach.1.gz %%DATADIR%%/man/man1/pdffonts.1.gz %%DATADIR%%/man/man1/pdfimages.1.gz @@ -26,3 +25,4 @@ etc/xpdfrc %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/hello.pdf +@sample etc/xpdfrc.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509180516.t8I5GaUX045010>