FreeBSD Bugzilla – Attachment 135015 Details for
Bug 179786
graphics/poppler and xpdf contain conflicting files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.36 KB, created by
ftigeot
on 2013-06-20 20:20:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
ftigeot
Created:
2013-06-20 20:20:01 UTC
Size:
3.36 KB
patch
obsolete
>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) > -@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 > -@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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 179786
: 135015