aboutsummaryrefslogtreecommitdiff
path: root/graphics/xpdf
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/xpdf')
-rw-r--r--graphics/xpdf/Makefile41
-rw-r--r--graphics/xpdf/distinfo14
-rw-r--r--graphics/xpdf/files/patch-Makefile.in11
-rw-r--r--graphics/xpdf/files/patch-configure15
-rw-r--r--graphics/xpdf/files/patch-configure.in11
-rw-r--r--graphics/xpdf/files/patch-fofi_FoFiTrueType.cc11
-rw-r--r--graphics/xpdf/files/patch-splash_Makefile.in10
-rw-r--r--graphics/xpdf/files/patch-splash_Splash.cc14
-rw-r--r--graphics/xpdf/files/patch-xpdf::Makefile.in11
-rw-r--r--graphics/xpdf/files/patch-xpdf_GlobalParams.h9
-rw-r--r--graphics/xpdf/files/patch-xpdf_Makefile.in10
-rw-r--r--graphics/xpdf/pkg-plist2
12 files changed, 46 insertions, 113 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index c30790bfd50f..34bb2339bf1a 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -6,43 +6,37 @@
#
PORTNAME= xpdf
-PORTVERSION= 3.02
-PORTREVISION= 16
+PORTVERSION= 3.03
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= t1.5:${PORTSDIR}/devel/t1lib \
- freetype.9:${PORTSDIR}/print/freetype2
-RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
+LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-CONFLICTS= poppler-utils-0.*
+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"
+ --with-freetype2-includes="${LOCALBASE}/include/freetype2/"
OPTIONS= LIBPAPER "Enable libpaper" off \
- DRAW "Enable drawing annotations" on \
+ TYPE1 "Ghostscript type1 fonts" on \
X11 "Enable X11 support" on \
-.include <bsd.port.pre.mk>
+.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
@@ -59,13 +53,12 @@ CONFIGURE_ARGS+= --enable-a4-paper
MAN1= pdffonts.1 \
pdfimages.1 \
pdfinfo.1 \
+ pdfdetach.1 \
pdftoppm.1 \
pdftops.1 \
pdftotext.1
MAN5= xpdfrc.5
-CONFLICTS= poppler-utils-[0-9]*
-
.if defined(WITHOUT_X11)
PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+= --without-x
@@ -77,22 +70,16 @@ MAN1+= xpdf.1
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
-.endif
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for file in ANNOUNCE CHANGES INSTALL README misc/hello.pdf
+.for file in ANNOUNCE CHANGES README misc/hello.pdf
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xpdf/distinfo b/graphics/xpdf/distinfo
index ba8d1cb24e74..6e12a2345c66 100644
--- a/graphics/xpdf/distinfo
+++ b/graphics/xpdf/distinfo
@@ -1,14 +1,4 @@
-SHA256 (xpdf-3.02.tar.gz) = b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00
-SIZE (xpdf-3.02.tar.gz) = 674912
-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 (xpdf-3.03.tar.gz) = 02cf63d8f6326eda644096cd0f969e1588702ad87222c1e9388a93c270fbceca
+SIZE (xpdf-3.03.tar.gz) = 795537
SHA256 (patch-zz-xpdf-annot.20080728a) = c96308c0fb90450251a6f8a19b5436a5fd5d70b4d6af2626ba85d3c4b7300fe1
SIZE (patch-zz-xpdf-annot.20080728a) = 69092
diff --git a/graphics/xpdf/files/patch-Makefile.in b/graphics/xpdf/files/patch-Makefile.in
index 071cf5f53a08..334378df41e8 100644
--- a/graphics/xpdf/files/patch-Makefile.in
+++ b/graphics/xpdf/files/patch-Makefile.in
@@ -1,18 +1,17 @@
---- Makefile.in.orig Tue Feb 27 14:05:51 2007
-+++ Makefile.in
-@@ -82,7 +82,7 @@
- $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
+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)
-@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
-@@ -90,7 +90,7 @@
- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.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
-@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
diff --git a/graphics/xpdf/files/patch-configure b/graphics/xpdf/files/patch-configure
deleted file mode 100644
index 5efb6b34b60b..000000000000
--- a/graphics/xpdf/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
diff --git a/graphics/xpdf/files/patch-configure.in b/graphics/xpdf/files/patch-configure.in
deleted file mode 100644
index 9c23e3b6ce35..000000000000
--- a/graphics/xpdf/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig Tue Feb 27 14:05:51 2007
-+++ configure.in
-@@ -348,6 +348,6 @@
- if test "x$smr_have_freetype2_library" != xyes; then
- AC_MSG_WARN([Couldn't find FreeType]);
- fi
-- AC_MSG_WARN([-- You will be able to compile pdftops, pdftotext,
-- pdfinfo, pdffonts, and pdfimages, but not xpdf or pdftoppm])
-+ AC_MSG_WARN([-- You will be able to compile pdftoppm, pdftops, pdftotext,
-+ pdfinfo, pdffonts, and pdfimages, but not xpdf])
- fi
diff --git a/graphics/xpdf/files/patch-fofi_FoFiTrueType.cc b/graphics/xpdf/files/patch-fofi_FoFiTrueType.cc
deleted file mode 100644
index e8d2f32d178f..000000000000
--- a/graphics/xpdf/files/patch-fofi_FoFiTrueType.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- fofi/FoFiTrueType.cc.orig 2010-12-29 12:13:14.000000000 -0800
-+++ fofi/FoFiTrueType.cc 2010-12-29 12:15:15.000000000 -0800
-@@ -906,7 +906,7 @@
- // check for an incorrect cmap table length
- badCmapLen = gFalse;
- cmapLen = 0; // make gcc happy
-- if (!missingCmap) {
-+ if (!missingCmap && cmaps != NULL && nCmaps != 0) {
- cmapLen = cmaps[0].offset + cmaps[0].len;
- for (i = 1; i < nCmaps; ++i) {
- if (cmaps[i].offset + cmaps[i].len > cmapLen) {
diff --git a/graphics/xpdf/files/patch-splash_Makefile.in b/graphics/xpdf/files/patch-splash_Makefile.in
new file mode 100644
index 000000000000..2fbaccffa377
--- /dev/null
+++ b/graphics/xpdf/files/patch-splash_Makefile.in
@@ -0,0 +1,10 @@
+Index: splash/Makefile.in
+@@ -16,7 +16,7 @@
+ FOFISRCDIR = $(srcdir)/../fofi
+ FOFILIBDIR = ../fofi
+
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
++CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@ @X_CFLAGS@
+
+ CXX = @CXX@
+ AR = @AR@
diff --git a/graphics/xpdf/files/patch-splash_Splash.cc b/graphics/xpdf/files/patch-splash_Splash.cc
deleted file mode 100644
index 186b76052d6d..000000000000
--- a/graphics/xpdf/files/patch-splash_Splash.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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) {
diff --git a/graphics/xpdf/files/patch-xpdf::Makefile.in b/graphics/xpdf/files/patch-xpdf::Makefile.in
deleted file mode 100644
index 8479feed6db5..000000000000
--- a/graphics/xpdf/files/patch-xpdf::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpdf/Makefile.in.orig Tue Feb 27 14:05:52 2007
-+++ xpdf/Makefile.in
-@@ -110,7 +110,7 @@
- pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
-
- all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
-- pdfimages$(EXE)
-+ pdftoppm$(EXE) pdfimages$(EXE)
-
- #------------------------------------------------------------------------
-
diff --git a/graphics/xpdf/files/patch-xpdf_GlobalParams.h b/graphics/xpdf/files/patch-xpdf_GlobalParams.h
index 51396ee55325..9d6349e4d487 100644
--- a/graphics/xpdf/files/patch-xpdf_GlobalParams.h
+++ b/graphics/xpdf/files/patch-xpdf_GlobalParams.h
@@ -1,11 +1,10 @@
---- xpdf/GlobalParams.h.orig 2007-02-28 00:05:52.000000000 +0200
-+++ xpdf/GlobalParams.h 2008-04-04 15:40:29.000000000 +0300
-@@ -157,6 +157,8 @@
+Index: xpdf/GlobalParams.h
+@@ -132,6 +132,8 @@
#define xpdfKeyCodeDown 0x100d
#define xpdfKeyCodeF1 0x1100
#define xpdfKeyCodeF35 0x1122
-+#define xpdfKeyPlus 0x1200
-+#define xpdfKeyMinus 0x1201
++#define xpdfKeyPlus 0x1200
++#define xpdfKeyMinus 0x1201
#define xpdfKeyCodeMousePress1 0x2001
#define xpdfKeyCodeMousePress2 0x2002
#define xpdfKeyCodeMousePress3 0x2003
diff --git a/graphics/xpdf/files/patch-xpdf_Makefile.in b/graphics/xpdf/files/patch-xpdf_Makefile.in
new file mode 100644
index 000000000000..f9ad7c80f812
--- /dev/null
+++ b/graphics/xpdf/files/patch-xpdf_Makefile.in
@@ -0,0 +1,10 @@
+Index: xpdf/Makefile.in
+@@ -112,7 +112,7 @@
+ pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
+
+ all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
+- pdfdetach$(EXE) pdfimages$(EXE)
++ pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
+
+ #------------------------------------------------------------------------
+
diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist
index 9ea6607410e2..c02b6b64358e 100644
--- a/graphics/xpdf/pkg-plist
+++ b/graphics/xpdf/pkg-plist
@@ -1,6 +1,7 @@
bin/pdffonts
bin/pdfimages
bin/pdfinfo
+bin/pdfdetach
bin/pdftoppm
bin/pdftops
bin/pdftotext
@@ -8,7 +9,6 @@ bin/pdftotext
etc/xpdfrc
%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/hello.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 04:24:40 +0000