Re: Conflict between print/xpdf and print/poppler-utils

[Bernd Ernesti <netbsd%lists.veego.de@localhost>]

On Sun, Oct 25, 2009 at 11:30:57PM +0100, Rhialto wrote:
> I'm building my pkgsrc-2009Q3 packages, and I'm running into the
> following conflict.
> 
> print/xpdf and print/poppler-utils install nearly the same files. The
> main difference is that xpdf actually installs a PDF viewer (xpdf) and
> that poppler-utils installs an additional utility program (pdftohtml).
> 
> The conflict is quite annoying, since poppler-utils is required by a
> higher-level package that I want (scribus, via cups), but I also want a
> PDF viewer (in fact I want several, for use in case of compatibility
> problems).
> 
> How to resolve this?

* Either by not install the additional tool for xpdf
* Or install them under a different name, like in the attched patch-aa which 
replaces
  the current patch-aa, but this needs an additional step because the manpages 
still
  references to the non 'x'pdf name and I think the programs themselfs needs 
some
  additional patching for the help messages.

I think it shouldn't be too difficult to create a different patch-aa where the 
install
target will not install these tools and remove them from the PLIST file. And a 
changed
patch-am which wouldn't build these tools at all.

Bernd

$NetBSD$

--- Makefile.in.orig    2007-02-27 23:05:51.000000000 +0100
+++ Makefile.in 2009-10-26 00:30:18.000000000 +0100
@@ -13,6 +13,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
+exampledir = @prefix@/share/examples/xpdf
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -78,28 +79,28 @@
 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)
-@X@    $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
-       $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) 
$(DESTDIR)@bindir@/pdfimages$(EXE)
+       $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/xpdftops$(EXE)
+       $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) 
$(DESTDIR)@bindir@/xpdftotext$(EXE)
+       $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/xpdfinfo$(EXE)
+       $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) 
$(DESTDIR)@bindir@/xpdffonts$(EXE)
+@X@    $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) 
$(DESTDIR)@bindir@/xpdftoppm$(EXE)
+       $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) 
$(DESTDIR)@bindir@/xpdfimages$(EXE)
        -mkdir -p $(DESTDIR)@mandir@/man1
 @X@    $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.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
-@X@    $(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/pdftops.1 
$(DESTDIR)@mandir@/man1/xpdftops.1
+       $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 
$(DESTDIR)@mandir@/man1/xpdftotext.1
+       $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 
$(DESTDIR)@mandir@/man1/xpdfinfo.1
+       $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 
$(DESTDIR)@mandir@/man1/xpdffonts.1
+@X@    $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 
$(DESTDIR)@mandir@/man1/xpdftoppm.1
+       $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 
$(DESTDIR)@mandir@/man1/xpdfimages.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; \
+       -mkdir -p $(DESTDIR)$(exampledir)
+       @if test ! -f $(DESTDIR)$(exampledir)/xpdfrc; then \
+               echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc 
$(DESTDIR)$(exampledir)/xpdfrc"; \
+               $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc 
$(DESTDIR)$(exampledir)/xpdfrc; \
        else \
-               echo "# not overwriting the existing 
$(DESTDIR)@sysconfdir@/xpdfrc"; \
+               echo "# not overwriting the existing 
$(DESTDIR)$(exampledir)/xpdfrc"; \
        fi
 
 clean:

Index: PLIST
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/print/xpdf/PLIST,v
retrieving revision 1.9
diff -b -u -r1.9 PLIST
--- PLIST       14 Jun 2009 18:12:03 -0000      1.9
+++ PLIST       25 Oct 2009 23:38:56 -0000
@@ -1,17 +1,17 @@
 @comment $NetBSD: PLIST,v 1.9 2009/06/14 18:12:03 joerg Exp $
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
-bin/pdftoppm
-bin/pdftops
-bin/pdftotext
+bin/xpdffonts
+bin/xpdfimages
+bin/xpdfinfo
+bin/xpdftoppm
+bin/xpdftops
+bin/xpdftotext
 bin/xpdf
-man/man1/pdffonts.1
-man/man1/pdfimages.1
-man/man1/pdfinfo.1
-man/man1/pdftoppm.1
-man/man1/pdftops.1
-man/man1/pdftotext.1
+man/man1/xpdffonts.1
+man/man1/xpdfimages.1
+man/man1/xpdfinfo.1
+man/man1/xpdftoppm.1
+man/man1/xpdftops.1
+man/man1/xpdftotext.1
 man/man1/xpdf.1
 man/man5/xpdfrc.5
 share/examples/xpdf/xpdfrc