Making xpdf coexist with poppler-utils
Cy Schubert
Cy.Schubert at komquats.com
Wed May 9 06:10:59 UTC 2012
Hi araujo@,
I'm looking at installing poppler-utils on the same system as xpdf. What do
you think of the following patch?
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/xpdf/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile 15 Apr 2012 03:57:41 -0000 1.101
+++ Makefile 9 May 2012 06:09:48 -0000
@@ -7,6 +7,7 @@
PORTNAME= xpdf
PORTVERSION= 3.03
+PORTREVISION= 1
CATEGORIES= graphics print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_TEX_CTAN}
@@ -17,8 +18,7 @@
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-
-CONFLICTS= poppler-utils-[0-9]*
+RUN_DEPENDS pdffonts:${PORTSDIR}/graphics/poppler-utils
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -50,13 +50,7 @@
CONFIGURE_ARGS+= --enable-a4-paper
.endif
-MAN1= pdffonts.1 \
- pdfimages.1 \
- pdfinfo.1 \
- pdfdetach.1 \
- pdftoppm.1 \
- pdftops.1 \
- pdftotext.1
+MAN1= pdfdetach.1
MAN5= xpdfrc.5
.if defined(WITHOUT_X11)
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/xpdf/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist 15 Apr 2012 03:57:41 -0000 1.13
+++ pkg-plist 9 May 2012 06:09:48 -0000
@@ -1,10 +1,5 @@
-bin/pdffonts
-bin/pdfimages
-bin/pdfinfo
bin/pdfdetach
-bin/pdftoppm
bin/pdftops
-bin/pdftotext
%%X11%%bin/xpdf
etc/xpdfrc
%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/graphics/xpdf/files/patch-Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile.in
--- files/patch-Makefile.in 15 Apr 2012 03:57:41 -0000 1.3
+++ files/patch-Makefile.in 9 May 2012 06:09:48 -0000
@@ -1,19 +1,71 @@
-Index: Makefile.in
-@@ -89,7 +89,7 @@
+--- Makefile.in.orig 2011-08-15 14:08:52.000000000 -0700
++++ Makefile.in 2012-05-08 23:08:12.211341675 -0700
+@@ -37,68 +37,26 @@
+ cd @UP_DIR at splash; $(MAKE)
+ cd @UP_DIR at xpdf; $(MAKE) xpdf$(EXE)
+
+-pdftops: dummy
+- cd goo; $(MAKE)
+- cd @UP_DIR at fofi; $(MAKE)
+- cd @UP_DIR at splash; $(MAKE)
+- cd @UP_DIR at xpdf; $(MAKE) pdftops$(EXE)
+-
+-pdftotext: dummy
+- cd goo; $(MAKE)
+- cd @UP_DIR at fofi; $(MAKE)
+- cd @UP_DIR at splash; $(MAKE)
+- cd @UP_DIR at xpdf; $(MAKE) pdftotext$(EXE)
+-
+-pdfinfo:
+- cd goo; $(MAKE)
+- cd @UP_DIR at fofi; $(MAKE)
+- cd @UP_DIR at splash; $(MAKE)
+- cd @UP_DIR at xpdf; $(MAKE) pdfinfo$(EXE)
+-
+-pdffonts:
+- cd goo; $(MAKE)
+- cd @UP_DIR at fofi; $(MAKE)
+- cd @UP_DIR at splash; $(MAKE)
+- cd @UP_DIR at xpdf; $(MAKE) pdffonts$(EXE)
+-
+ pdfdetach:
+ cd goo; $(MAKE)
+ cd @UP_DIR at fofi; $(MAKE)
+ cd @UP_DIR at splash; $(MAKE)
+ cd @UP_DIR at xpdf; $(MAKE) pdfdetach$(EXE)
+
+-pdftoppm:
+- cd goo; $(MAKE)
+- cd @UP_DIR at fofi; $(MAKE)
+- cd @UP_DIR at splash; $(MAKE)
+- cd @UP_DIR at xpdf; $(MAKE) pdftoppm$(EXE)
+-
+-pdfimages:
+- cd goo; $(MAKE)
+- cd @UP_DIR at fofi; $(MAKE)
+- cd @UP_DIR at splash; $(MAKE)
+- cd @UP_DIR at xpdf; $(MAKE) pdfimages$(EXE)
+-
+ 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$(EX
E)
-+ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(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/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
+- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftote
xt.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/pdfdeta
ch.1
- at X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdfto
ppm.1
-+ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm
.1
$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimag
es.1
-mkdir -p $(DESTDIR)@mandir@/man5
$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
--
Cheers,
Cy Schubert <Cy.Schubert at komquats.com>
FreeBSD UNIX: <cy at FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
More information about the freebsd-gnome
mailing list