aboutsummaryrefslogtreecommitdiff
path: root/graphics/xpdf
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2015-09-18 05:16:35 +0000
committerCy Schubert <cy@FreeBSD.org>2015-09-18 05:16:35 +0000
commit3425826be06d738d389dd33d693a44c181d8adf0 (patch)
tree5ee008c92717161deb324cf5c500a7b5e7df2b48 /graphics/xpdf
parentac8a8b1b7e6464eac0fb9e79f7f6a1fd696758aa (diff)
downloadports-3425826be06d738d389dd33d693a44c181d8adf0.tar.gz
ports-3425826be06d738d389dd33d693a44c181d8adf0.zip
Don't overwrite etc/xpdfrc, use @sample instead.
PR: 203187
Notes
Notes: svn path=/head/; revision=397216
Diffstat (limited to 'graphics/xpdf')
-rw-r--r--graphics/xpdf/Makefile2
-rw-r--r--graphics/xpdf/files/patch-Makefile.in12
-rw-r--r--graphics/xpdf/pkg-plist2
3 files changed, 12 insertions, 4 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 0a73fdce5722..7e3967067af7 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -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/ \
diff --git a/graphics/xpdf/files/patch-Makefile.in b/graphics/xpdf/files/patch-Makefile.in
index ff2a302f980e..6df513c49f4d 100644
--- a/graphics/xpdf/files/patch-Makefile.in
+++ b/graphics/xpdf/files/patch-Makefile.in
@@ -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
diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist
index 73d4f76afda6..724f3f9360bc 100644
--- a/graphics/xpdf/pkg-plist
+++ b/graphics/xpdf/pkg-plist
@@ -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