ports/179786: graphics/poppler and xpdf contain conflicting files

[Francois Tigeot]

>Number:         179786
>Category:       ports
>Synopsis:       graphics/poppler and xpdf contain conflicting files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 20 19:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Francois Tigeot
>Release:        DragonFly 3.5
>Organization:
Dports
>Environment:
DragonFly sekishi.zefyris.com 3.5-DEVELOPMENT DragonFly v3.5.0.405.gb119b4-DEVELOPMENT #0: Thu Jun 20 10:28:27 CEST 2013     ftigeot at sekishi.zefyris.com:/usr/obj/usr/src/sys/X86_64_GENERIC  x86_64

>Description:
Both graphics/poppler and graphics/xpdf try to install some conflicting files.

These are:
  man/man1/pdfdetach.1.gz
  man/man1/pdffonts.1.gz
  man/man1/pdfimages.1.gz
  man/man1/pdfinfo.1.gz
  man/man1/pdftoppm.1.gz
  man/man1/pdftops.1.gz
  man/man1/pdftotext.1.gz

Since poppler is based on xpdf and better maintained, I propose to remove these files (and the associated utilities) from the xpdf port.
>How-To-Repeat:
Try to install both poppler and xpdf:

# pkg install xpdf        
Updating repository catalogue
Repository catalogue is up-to-date, no need to fetch fresh copy
The following packages will be installed:

        Reinstalling xpdf-3.03_3

The installation will require 8 MB more space

0 B to be downloaded

Proceed with installing packages [y/N]: y
Checking integrity...pkg: WARNING: locally installed poppler-utils-0.22.2 conflicts on /usr/local/man/man1/pdfdetach.1.gz with:
        - xpdf-3.03_3

etc...

>Fix:
Apply the attached patch to /usr/ports/graphics/xpdf

Patch attached with submission follows:

diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 5851a9d..a0658a5 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -46,13 +46,6 @@ CONFIGURE_ARGS+=--without-libpaper-library
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif
 
-MAN1=		pdffonts.1 \
-		pdfimages.1 \
-		pdfinfo.1 \
-		pdfdetach.1 \
-		pdftoppm.1 \
-		pdftops.1 \
-		pdftotext.1
 MAN5=		xpdfrc.5
 
 .if ${PORT_OPTIONS:MX11}
diff --git a/graphics/xpdf/files/patch-Makefile.in b/graphics/xpdf/files/patch-Makefile.in
index 334378d..6b6cf9b 100644
--- a/graphics/xpdf/files/patch-Makefile.in
+++ b/graphics/xpdf/files/patch-Makefile.in
@@ -1,19 +1,25 @@
-Index: Makefile.in
-@@ -89,7 +89,7 @@
- 	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
- 	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
- 	$(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
+--- Makefile.in.orig	2011-08-15 21:08:52.000000000 +0000
++++ Makefile.in
+@@ -84,22 +84,8 @@ dummy:
+ install: dummy
+ 	-mkdir -p $(DESTDIR)@bindir@
+ @X@	$(INSTALL_PROGRAM) xpdf/xpdf$(EXE) $(DESTDIR)@bindir@/xpdf$(EXE)
+-	$(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE)
+-	$(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
+-	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
+-	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
+-	$(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
 - at X@	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
-+	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
- 	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
+-	$(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 +98,7 @@
- 	$(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
+-	$(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
+-	$(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
+-	$(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
 - at X@	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
-+	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
- 	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
+-	$(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@
diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist
index 7bea4b4..13895c1 100644
--- a/graphics/xpdf/pkg-plist
+++ b/graphics/xpdf/pkg-plist
@@ -1,10 +1,3 @@
-libexec/xpdf/pdffonts
-libexec/xpdf/pdfimages
-libexec/xpdf/pdfinfo
-libexec/xpdf/pdfdetach
-libexec/xpdf/pdftoppm
-libexec/xpdf/pdftops
-libexec/xpdf/pdftotext
 libexec/xpdf/xpdf
 %%X11%%bin/xpdf
 etc/xpdfrc


>Release-Note:
>Audit-Trail:
>Unformatted: