Attachment #123281 for bug #166601

View | Details | Raw Unified | Return to bug 166601
Collapse All | Expand All




#

PORTNAME=	xpdf
PORTVERSION=	3.03
PORTREVISION=	16
CATEGORIES=	graphics print
MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
		${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR=	support/xpdf

PATCH_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
PATCHFILES=	xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch \
		xpdf-3.02pl4.patch xpdf-3.02pl5.patch
PATCH_DIST_STRIP=	-p1

MAINTAINER=	araujo@FreeBSD.org
COMMENT=	Display PDF files, and convert them to other formats

BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
		freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts

CONFLICTS=	poppler-utils-[0-9]*

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	autoconf
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ARGS=	--enable-opi \
		--with-t1-library="${LOCALBASE}/lib" \
		--with-t1-includes="${LOCALBASE}/include" \
		--with-freetype2-library="${LOCALBASE}/lib" \
		--with-freetype2-includes="${LOCALBASE}/include/freetype2/"

OPTIONS=	LIBPAPER "Enable libpaper"      off     \
		TYPE1	"Ghostscript type1 fonts" on \
		X11     "Enable X11 support"    on      \

.include <bsd.port.options.mk>

.if defined(WITH_TYPE1)
RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
.endif

.if defined(WITH_LIBPAPER)
LIB_DEPENDS+=	paper.2:${PORTSDIR}/print/libpaper

		pdftotext.1
MAN5=		xpdfrc.5

CONFLICTS=	poppler-utils-[0-9]*

.if defined(WITHOUT_X11)
PKGNAMESUFFIX+=		-nox11
CONFIGURE_ARGS+=	--without-x

PLIST_SUB+=		X11=""
.endif

.if defined(WITH_DRAW)
# add support for adding/deleting drawing annotations in PDF files
PATCH_SITES+=   http://info.iet.unipi.it/~luigi/FreeBSD/
PATCHFILES+=    patch-zz-xpdf-annot.20080728a

post-patch:
	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
		${WRKSRC}/xpdf/XPDFViewer.h

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for file in ANNOUNCE CHANGES README misc/hello.pdf
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.mk>




SHA256 (xpdf-3.03.tar.gz) = 02cf63d8f6326eda644096cd0f969e1588702ad87222c1e9388a93c270fbceca
SIZE (xpdf-3.03.tar.gz) = 795537
SHA256 (xpdf-3.02pl1.patch) = 58f613b00b414a86aa776b76fcd899bb415e4ee4edc2184c8a7c4ed1004dbbf3
SIZE (xpdf-3.02pl1.patch) = 1050
SHA256 (xpdf-3.02pl2.patch) = d1c1d887b0b8a5283f04f825e44f085f2e92daf7b518889acf1bc89ea07ed9d9
SIZE (xpdf-3.02pl2.patch) = 20843
SHA256 (xpdf-3.02pl3.patch) = 594ce8fbd23bff29eacddfae3533c63c7e86b4a24f7d45e44f1937d3d19e534b
SIZE (xpdf-3.02pl3.patch) = 30727
SHA256 (xpdf-3.02pl4.patch) = b0844395411318766ef750987787f778231e94bc15f04f7f7d16f41fd58188b0
SIZE (xpdf-3.02pl4.patch) = 6982
SHA256 (xpdf-3.02pl5.patch) = 92fcb3083a19e37b3096978043faea8c777e7aaeca3834b832d99bc2af3171ba
SIZE (xpdf-3.02pl5.patch) = 1065
SHA256 (patch-zz-xpdf-annot.20080728a) = c96308c0fb90450251a6f8a19b5436a5fd5d70b4d6af2626ba85d3c4b7300fe1
SIZE (patch-zz-xpdf-annot.20080728a) = 69092




Index: Makefile.in
@@ -89,7 +89,7 @@
@@ -82,7 +82,7 @@
 	$(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)
 	-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/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




--- configure.orig	Tue Feb 27 14:05:51 2007
+++ configure
@@ -11798,8 +11798,8 @@
     { echo "$as_me:$LINENO: WARNING: Couldn't find FreeType" >&5
 echo "$as_me: WARNING: Couldn't find FreeType" >&2;};
   fi
-  { echo "$as_me:$LINENO: WARNING: -- You will be able to compile pdftops, pdftotext,
-        pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm" >&5
-echo "$as_me: WARNING: -- You will be able to compile pdftops, pdftotext,
-        pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm" >&2;}
+  { echo "$as_me:$LINENO: WARNING: -- You will be able to compile pdftoppm, pdftops, pdftotext,
+        pdfinfo, pdffonts, and pdfimages, but not xpdf" >&5
+echo "$as_me: WARNING: -- You will be able to compile pdftoppm, pdftops, pdftotext,
+        pdfinfo, pdffonts, and pdfimages, but not xpdf" >&2;}
 fi

Lines 1-11 Link Here

(-)ports/graphics/xpdf/files/patch-configure.in (-11 lines)
1	--- configure.in.orig Tue Feb 27 14:05:51 2007
2	+++ configure.in
3	@@ -348,6 +348,6 @@
4	if test "x$smr_have_freetype2_library" != xyes; then
5	AC_MSG_WARN([Couldn't find FreeType]);
6	fi
7	- AC_MSG_WARN([-- You will be able to compile pdftops, pdftotext,
8	- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm])
9	+ AC_MSG_WARN([-- You will be able to compile pdftoppm, pdftops, pdftotext,
10	+ pdfinfo, pdffonts, and pdfimages, but not xpdf])
11	fi

Lines 1-11 Link Here

(-)ports/graphics/xpdf/files/patch-fofi_FoFiTrueType.cc (-11 lines)
1	--- fofi/FoFiTrueType.cc.orig 2010-12-29 12:13:14.000000000 -0800
2	+++ fofi/FoFiTrueType.cc 2010-12-29 12:15:15.000000000 -0800
3	@@ -906,7 +906,7 @@
4	// check for an incorrect cmap table length
5	badCmapLen = gFalse;
6	cmapLen = 0; // make gcc happy
7	- if (!missingCmap) {
8	+ if (!missingCmap && cmaps != NULL && nCmaps != 0) {
9	cmapLen = cmaps[0].offset + cmaps[0].len;
10	for (i = 1; i < nCmaps; ++i) {
11	if (cmaps[i].offset + cmaps[i].len > cmapLen) {

Line 0 Link Here

(-)/tmp/xpdf/files/patch-splash_Makefile.in (+10 lines)
	1	Index: splash/Makefile.in
	2	@@ -16,7 +16,7 @@
	3	FOFISRCDIR = $(srcdir)/../fofi
	4	FOFILIBDIR = ../fofi
	5
	6	-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
	7	+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@ @X_CFLAGS@
	8
	9	CXX = @CXX@
	10	AR = @AR@




--- splash/Splash.cc.orig	Tue Feb 27 14:05:52 2007
+++ splash/Splash.cc
@@ -2826,7 +2826,10 @@
 void Splash::compositeBackground(SplashColorPtr color) {
   SplashColorPtr p;
   Guchar *q;
-  Guchar alpha, alpha1, c, color0, color1, color2, color3;
+  Guchar alpha, alpha1, c, color0, color1, color2;
+#if SPLASH_CMYK
+  Guchar color3;
+#endif
   int x, y, mask;
 
   switch (bitmap->mode) {

Lines 1-11 Link Here

(-)ports/graphics/xpdf/files/patch-xpdf::Makefile.in (-11 lines)
1	--- xpdf/Makefile.in.orig Tue Feb 27 14:05:52 2007
2	+++ xpdf/Makefile.in
3	@@ -110,7 +110,7 @@
4	pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
5
6	all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
7	- pdfimages$(EXE)
8	+ pdftoppm$(EXE) pdfimages$(EXE)
9
10	#------------------------------------------------------------------------
11

Lines 1-11 Link Here

(-)ports/graphics/xpdf/files/patch-xpdf_GlobalParams.h (-5 / +4 lines)
1	--- xpdf/GlobalParams.h.orig 2007-02-28 00:05:52.000000000 +0200	1	Index: xpdf/GlobalParams.h
2	+++ xpdf/GlobalParams.h 2008-04-04 15:40:29.000000000 +0300	2	@@ -132,6 +132,8 @@
3	@@ -157,6 +157,8 @@
4	#define xpdfKeyCodeDown 0x100d	3	#define xpdfKeyCodeDown 0x100d
5	#define xpdfKeyCodeF1 0x1100	4	#define xpdfKeyCodeF1 0x1100
6	#define xpdfKeyCodeF35 0x1122	5	#define xpdfKeyCodeF35 0x1122
7	+#define xpdfKeyPlus 0x1200	6	+#define xpdfKeyPlus 0x1200
8	+#define xpdfKeyMinus 0x1201	7	+#define xpdfKeyMinus 0x1201
9	#define xpdfKeyCodeMousePress1 0x2001	8	#define xpdfKeyCodeMousePress1 0x2001
10	#define xpdfKeyCodeMousePress2 0x2002	9	#define xpdfKeyCodeMousePress2 0x2002
11	#define xpdfKeyCodeMousePress3 0x2003	10	#define xpdfKeyCodeMousePress3 0x2003

Line 0 Link Here

(-)ports/graphics/xpdf/files/patch-xpdf_Makefile.in (+10 lines)
	1	Index: xpdf/Makefile.in
	2	@@ -112,7 +112,7 @@
	3	pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
	4
	5	all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
	6	- pdfdetach$(EXE) pdfimages$(EXE)
	7	+ pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
	8
	9	#------------------------------------------------------------------------
	10

Lines 8-14 Link Here

(-)ports/graphics/xpdf/pkg-plist /tmp/xpdf/pkg-plist (-1 lines)
8	etc/xpdfrc	8	etc/xpdfrc
9	%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE	9	%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
10	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	10	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
11	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
12	%%PORTDOCS%%%%DOCSDIR%%/README	11	%%PORTDOCS%%%%DOCSDIR%%/README
13	%%PORTDOCS%%%%DOCSDIR%%/hello.pdf	12	%%PORTDOCS%%%%DOCSDIR%%/hello.pdf
14	%%PORTDOCS%%@dirrm %%DOCSDIR%%	13	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 166601

Lines 6-48 Link Here

(-)ports/graphics/xpdf/Makefile (-26 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= xpdf	8	PORTNAME= xpdf
9	PORTVERSION= 3.02	9	PORTVERSION= 3.03
10	PORTREVISION= 16
11	CATEGORIES= graphics print	10	CATEGORIES= graphics print
12	MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \	11	MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
13	${MASTER_SITE_TEX_CTAN}	12	${MASTER_SITE_TEX_CTAN}
14	MASTER_SITE_SUBDIR= support/xpdf	13	MASTER_SITE_SUBDIR= support/xpdf
15		14
16	PATCH_SITES= ftp://ftp.foolabs.com/pub/xpdf/
17	PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch \
18	xpdf-3.02pl4.patch xpdf-3.02pl5.patch
19	PATCH_DIST_STRIP= -p1
20
21	MAINTAINER= araujo@FreeBSD.org	15	MAINTAINER= araujo@FreeBSD.org
22	COMMENT= Display PDF files, and convert them to other formats	16	COMMENT= Display PDF files, and convert them to other formats
23		17
24	BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2	18	BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
25	LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \	19	LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
26	freetype.9:${PORTSDIR}/print/freetype2
27	RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
28		20
29	CONFLICTS= poppler-utils-0.*	21	CONFLICTS= poppler-utils-[0-9]*
30		22
		23	GNU_CONFIGURE= yes
31	USE_GMAKE= yes	24	USE_GMAKE= yes
32	USE_AUTOTOOLS= autoconf
33	CPPFLAGS+= -I${LOCALBASE}/include	25	CPPFLAGS+= -I${LOCALBASE}/include
34	LDFLAGS+= -L${LOCALBASE}/lib	26	LDFLAGS+= -L${LOCALBASE}/lib
35	CONFIGURE_ARGS= --enable-opi \	27	CONFIGURE_ARGS= --enable-opi \
36	--with-t1-library="${LOCALBASE}/lib" \
37	--with-t1-includes="${LOCALBASE}/include" \
38	--with-freetype2-library="${LOCALBASE}/lib" \	28	--with-freetype2-library="${LOCALBASE}/lib" \
39	--with-freetype2-includes="${LOCALBASE}/include/freetype2"	29	--with-freetype2-includes="${LOCALBASE}/include/freetype2/"
40		30
41	OPTIONS= LIBPAPER "Enable libpaper" off \	31	OPTIONS= LIBPAPER "Enable libpaper" off \
42	DRAW "Enable drawing annotations" on \	32	TYPE1 "Ghostscript type1 fonts" on \
43	X11 "Enable X11 support" on \	33	X11 "Enable X11 support" on \
44		34
45	.include <bsd.port.pre.mk>	35	.include <bsd.port.options.mk>
		36
		37	.if defined(WITH_TYPE1)
		38	RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
		39	.endif
46		40
47	.if defined(WITH_LIBPAPER)	41	.if defined(WITH_LIBPAPER)
48	LIB_DEPENDS+= paper.2:${PORTSDIR}/print/libpaper	42	LIB_DEPENDS+= paper.2:${PORTSDIR}/print/libpaper
Lines 64-71 Link Here
64	pdftotext.1	58	pdftotext.1
65	MAN5= xpdfrc.5	59	MAN5= xpdfrc.5
66		60
67	CONFLICTS= poppler-utils-[0-9]*
68
69	.if defined(WITHOUT_X11)	61	.if defined(WITHOUT_X11)
70	PKGNAMESUFFIX+= -nox11	62	PKGNAMESUFFIX+= -nox11
71	CONFIGURE_ARGS+= --without-x	63	CONFIGURE_ARGS+= --without-x
Lines 77-87 Link Here
77	PLIST_SUB+= X11=""	69	PLIST_SUB+= X11=""
78	.endif	70	.endif
79		71
80	.if defined(WITH_DRAW)
81	# add support for adding/deleting drawing annotations in PDF files
82	PATCH_SITES+= http://info.iet.unipi.it/~luigi/FreeBSD/
83	PATCHFILES+= patch-zz-xpdf-annot.20080728a
84
85	post-patch:	72	post-patch:
86	${REINPLACE_CMD} -e 's\|undef USE_COMBO_BOX\|define USE_COMBO_BOX 1\|' \	73	${REINPLACE_CMD} -e 's\|undef USE_COMBO_BOX\|define USE_COMBO_BOX 1\|' \
87	${WRKSRC}/xpdf/XPDFViewer.h	74	${WRKSRC}/xpdf/XPDFViewer.h
Lines 90-98 Link Here
90	post-install:	77	post-install:
91	.if !defined(NOPORTDOCS)	78	.if !defined(NOPORTDOCS)
92	@${MKDIR} ${DOCSDIR}	79	@${MKDIR} ${DOCSDIR}
93	.for file in ANNOUNCE CHANGES INSTALL README misc/hello.pdf	80	.for file in ANNOUNCE CHANGES README misc/hello.pdf
94	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	81	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
95	.endfor	82	.endfor
96	.endif	83	.endif
97		84
98	.include <bsd.port.post.mk>	85	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)ports/graphics/xpdf/distinfo (-12 / +2 lines)
1	SHA256 (xpdf-3.02.tar.gz) = b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00	1	SHA256 (xpdf-3.03.tar.gz) = 02cf63d8f6326eda644096cd0f969e1588702ad87222c1e9388a93c270fbceca
2	SIZE (xpdf-3.02.tar.gz) = 674912	2	SIZE (xpdf-3.03.tar.gz) = 795537
3	SHA256 (xpdf-3.02pl1.patch) = 58f613b00b414a86aa776b76fcd899bb415e4ee4edc2184c8a7c4ed1004dbbf3
4	SIZE (xpdf-3.02pl1.patch) = 1050
5	SHA256 (xpdf-3.02pl2.patch) = d1c1d887b0b8a5283f04f825e44f085f2e92daf7b518889acf1bc89ea07ed9d9
6	SIZE (xpdf-3.02pl2.patch) = 20843
7	SHA256 (xpdf-3.02pl3.patch) = 594ce8fbd23bff29eacddfae3533c63c7e86b4a24f7d45e44f1937d3d19e534b
8	SIZE (xpdf-3.02pl3.patch) = 30727
9	SHA256 (xpdf-3.02pl4.patch) = b0844395411318766ef750987787f778231e94bc15f04f7f7d16f41fd58188b0
10	SIZE (xpdf-3.02pl4.patch) = 6982
11	SHA256 (xpdf-3.02pl5.patch) = 92fcb3083a19e37b3096978043faea8c777e7aaeca3834b832d99bc2af3171ba
12	SIZE (xpdf-3.02pl5.patch) = 1065
13	SHA256 (patch-zz-xpdf-annot.20080728a) = c96308c0fb90450251a6f8a19b5436a5fd5d70b4d6af2626ba85d3c4b7300fe1	3	SHA256 (patch-zz-xpdf-annot.20080728a) = c96308c0fb90450251a6f8a19b5436a5fd5d70b4d6af2626ba85d3c4b7300fe1
14	SIZE (patch-zz-xpdf-annot.20080728a) = 69092	4	SIZE (patch-zz-xpdf-annot.20080728a) = 69092

Lines 1-18 Link Here

(-)ports/graphics/xpdf/files/patch-Makefile.in (-6 / +5 lines)
1	--- Makefile.in.orig Tue Feb 27 14:05:51 2007	1	Index: Makefile.in
2	+++ Makefile.in	2	@@ -89,7 +89,7 @@
3	@@ -82,7 +82,7 @@
4	$(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
5	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)	3	$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
6	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)	4	$(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
		5	$(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
7	-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)	6	-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
8	+ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)	7	+ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
9	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)	8	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
10	-mkdir -p $(DESTDIR)@mandir@/man1	9	-mkdir -p $(DESTDIR)@mandir@/man1
11	@X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1	10	@X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1
12	@@ -90,7 +90,7 @@	11	@@ -98,7 +98,7 @@
13	$(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
14	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1	12	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
15	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1	13	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
		14	$(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
16	-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1	15	-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
17	+ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1	16	+ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
18	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1	17	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1

Lines 1-15 Link Here

(-)ports/graphics/xpdf/files/patch-configure (-15 lines)
1	--- configure.orig Tue Feb 27 14:05:51 2007
2	+++ configure
3	@@ -11798,8 +11798,8 @@
4	{ echo "$as_me:$LINENO: WARNING: Couldn't find FreeType" >&5
5	echo "$as_me: WARNING: Couldn't find FreeType" >&2;};
6	fi
7	- { echo "$as_me:$LINENO: WARNING: -- You will be able to compile pdftops, pdftotext,
8	- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm" >&5
9	-echo "$as_me: WARNING: -- You will be able to compile pdftops, pdftotext,
10	- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm" >&2;}
11	+ { echo "$as_me:$LINENO: WARNING: -- You will be able to compile pdftoppm, pdftops, pdftotext,
12	+ pdfinfo, pdffonts, and pdfimages, but not xpdf" >&5
13	+echo "$as_me: WARNING: -- You will be able to compile pdftoppm, pdftops, pdftotext,
14	+ pdfinfo, pdffonts, and pdfimages, but not xpdf" >&2;}
15	fi

Lines 1-14 Link Here

(-)ports/graphics/xpdf/files/patch-splash_Splash.cc (-14 lines)
1	--- splash/Splash.cc.orig Tue Feb 27 14:05:52 2007
2	+++ splash/Splash.cc
3	@@ -2826,7 +2826,10 @@
4	void Splash::compositeBackground(SplashColorPtr color) {
5	SplashColorPtr p;
6	Guchar *q;
7	- Guchar alpha, alpha1, c, color0, color1, color2, color3;
8	+ Guchar alpha, alpha1, c, color0, color1, color2;
9	+#if SPLASH_CMYK
10	+ Guchar color3;
11	+#endif
12	int x, y, mask;
13
14	switch (bitmap->mode) {