diff options
-rw-r--r-- | print/xpdf/Makefile | 17 | ||||
-rw-r--r-- | print/xpdf/distinfo | 38 | ||||
-rw-r--r-- | print/xpdf/patches/patch-aa | 6 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ab | 6 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ad | 8 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ai | 14 | ||||
-rw-r--r-- | print/xpdf/patches/patch-aj | 8 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ak | 17 | ||||
-rw-r--r-- | print/xpdf/patches/patch-al | 13 | ||||
-rw-r--r-- | print/xpdf/patches/patch-an | 12 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ao | 12 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ap | 12 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ar | 12 | ||||
-rw-r--r-- | print/xpdf/patches/patch-as | 30 |
14 files changed, 62 insertions, 143 deletions
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index fad07ae350e..31857f3be21 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,19 +1,11 @@ -# $NetBSD: Makefile,v 1.38 2005/08/12 12:27:30 salo Exp $ +# $NetBSD: Makefile,v 1.39 2005/09/07 15:19:08 adam Exp $ -DISTNAME= xpdf-3.00 -PKGNAME= ${DISTNAME}pl3 -PKGREVISION= 1 +DISTNAME= xpdf-3.01 CATEGORIES= print MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/} \ http://gd.tuwien.ac.at/publishing/xpdf/ -PATCHFILES= xpdf-3.00pl1.patch -PATCHFILES+= xpdf-3.00pl2.patch -PATCHFILES+= xpdf-3.00pl3.patch -PATCH_SITES= ${MASTER_SITES} -PATCH_DIST_ARGS=-d ${WRKSRC}/xpdf --quiet - MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://www.foolabs.com/xpdf/ COMMENT= Display tool for PDF files @@ -22,10 +14,9 @@ DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts CONFLICTS= xpdf-crypto-[0-9]* -USE_PKGINSTALL= YES +USE_PKGINSTALL= yes USE_LANGUAGES= c c++ - -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2 CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo index ca60534d91e..ff08accf4cb 100644 --- a/print/xpdf/distinfo +++ b/print/xpdf/distinfo @@ -1,32 +1,20 @@ -$NetBSD: distinfo,v 1.20 2005/08/12 12:27:30 salo Exp $ +$NetBSD: distinfo,v 1.21 2005/09/07 15:19:08 adam Exp $ -SHA1 (xpdf-3.00.tar.gz) = 080317afce0851274fec2865131f59590b54eb99 -RMD160 (xpdf-3.00.tar.gz) = d98668ac8cd059461107c4dfbd9b3fd3beff6176 -Size (xpdf-3.00.tar.gz) = 534697 bytes -SHA1 (xpdf-3.00pl1.patch) = b984f64c25310e3b0bdebd9b75088ea46e067735 -RMD160 (xpdf-3.00pl1.patch) = d8cc3c381fca5c388bae9fa1c240548a97241a13 -Size (xpdf-3.00pl1.patch) = 7434 bytes -SHA1 (xpdf-3.00pl2.patch) = 9b406ea1514b508893460c3ec9cb6131287b1c9c -RMD160 (xpdf-3.00pl2.patch) = 70fc8d6cccb02adb2ba32ea6911682ead6a1649a -Size (xpdf-3.00pl2.patch) = 1645 bytes -SHA1 (xpdf-3.00pl3.patch) = c29b9ea13d1f8567a4521e12d50e497bf1681608 -RMD160 (xpdf-3.00pl3.patch) = 7fb5521b698589245f9e0ccea753a6d4e30badf8 -Size (xpdf-3.00pl3.patch) = 346 bytes -SHA1 (patch-aa) = 3f5d7792b9febecccbce49848755a351465df729 -SHA1 (patch-ab) = 775bfdd4d81ac8b6dd358eeec320097faaecaf90 +SHA1 (xpdf-3.01.tar.gz) = 472cbf0f3df4e20a3ab7ada2e704b4e10d1d385b +RMD160 (xpdf-3.01.tar.gz) = d734065ce12db8d0c37d9d0ac0ca7c287be59442 +Size (xpdf-3.01.tar.gz) = 599778 bytes +SHA1 (patch-aa) = 6664207f59076a2612cf4141b7ab4b072b404e3a +SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90 SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 -SHA1 (patch-ad) = 303dbde0636e79601745808c514c77c31ef3d1b5 +SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143 SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a -SHA1 (patch-ai) = baa4308f9c44c750f54868dc3e355588dfd0dac8 -SHA1 (patch-aj) = 428b2da89b1775afbd2752ec105adad966babdf9 -SHA1 (patch-ak) = e09c064906e0695fe31ab9f20fb9b6945b1b25cc -SHA1 (patch-al) = 785bf1547e0bf5273b66e5b18adbcccaa85aee35 +SHA1 (patch-ai) = 041f0b7afbd46e109a6c38a5edef5bd38bb41034 +SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860 +SHA1 (patch-ak) = ed9506fd0cba7e350608cd40b1f794253f30e917 +SHA1 (patch-al) = b6e958b0592ac285b3ade90079c83da30db8a8b6 SHA1 (patch-am) = 794ff952c749c8dab6f575d55602cdc7e7157fef -SHA1 (patch-an) = bf579a07e9b9868ed8d6a6450484c47ce9acaef0 -SHA1 (patch-ao) = fd25cab0255d24c4b55907b031f5f4ec68411576 -SHA1 (patch-ap) = 51d05bb8978003308e14274fc1ada4f1ace6d766 -SHA1 (patch-ar) = bd66ea42d4ba11bdcefcfef2988d37559f21e629 -SHA1 (patch-as) = e76bc488bc533ef3784ed863c2c5d4b0967afc29 +SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a +SHA1 (patch-ar) = f3d320991e189a21244acd31ca5cc6cfdb18bd96 diff --git a/print/xpdf/patches/patch-aa b/print/xpdf/patches/patch-aa index 756eb06644f..ea0bf80c3ed 100644 --- a/print/xpdf/patches/patch-aa +++ b/print/xpdf/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2004/03/03 10:50:09 adam Exp $ +$NetBSD: patch-aa,v 1.6 2005/09/07 15:19:08 adam Exp $ ---- Makefile.in.orig 2004-01-22 01:26:44.000000000 +0000 +--- Makefile.in.orig 2005-08-17 05:34:30.000000000 +0000 +++ Makefile.in @@ -13,6 +13,7 @@ DESTDIR = prefix = @prefix@ @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.5 2004/03/03 10:50:09 adam Exp $ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -95,12 +96,12 @@ install: dummy +@@ -94,12 +95,12 @@ install: dummy $(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 diff --git a/print/xpdf/patches/patch-ab b/print/xpdf/patches/patch-ab index e8c27a21159..4b4a8ae3d33 100644 --- a/print/xpdf/patches/patch-ab +++ b/print/xpdf/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2004/03/03 10:50:09 adam Exp $ +$NetBSD: patch-ab,v 1.5 2005/09/07 15:19:08 adam Exp $ ---- xpdf/XPDFViewer.cc.orig 2004-01-22 01:26:45.000000000 +0000 +--- xpdf/XPDFViewer.cc.orig 2005-08-17 05:34:31.000000000 +0000 +++ xpdf/XPDFViewer.cc -@@ -181,9 +181,12 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, GS +@@ -175,9 +175,12 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, GS XPDFViewer::~XPDFViewer() { delete core; diff --git a/print/xpdf/patches/patch-ad b/print/xpdf/patches/patch-ad index 2d105ce7d61..2ea032bcc1e 100644 --- a/print/xpdf/patches/patch-ad +++ b/print/xpdf/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2003/03/25 14:02:40 salo Exp $ +$NetBSD: patch-ad,v 1.4 2005/09/07 15:19:08 adam Exp $ ---- doc/pdfimages.1.orig 2003-03-21 08:01:01.000000000 +0100 -+++ doc/pdfimages.1 2003-03-25 12:40:49.000000000 +0100 -@@ -25,7 +25,7 @@ +--- doc/pdfimages.1.orig 2005-08-17 05:34:30.000000000 +0000 ++++ doc/pdfimages.1 +@@ -29,7 +29,7 @@ color inversion, etc. done by the PDF co Pdfimages reads a configuration file at startup. It first tries to find the user's private config file, ~/.xpdfrc. If that doesn't exist, it looks for a system-wide config file, typically diff --git a/print/xpdf/patches/patch-ai b/print/xpdf/patches/patch-ai index 9e1cea0cc2a..ec76e278323 100644 --- a/print/xpdf/patches/patch-ai +++ b/print/xpdf/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.1 2003/03/25 14:02:42 salo Exp $ +$NetBSD: patch-ai,v 1.2 2005/09/07 15:19:08 adam Exp $ ---- doc/sample-xpdfrc.orig 2003-03-21 08:01:01.000000000 +0100 -+++ doc/sample-xpdfrc 2003-03-25 12:45:39.000000000 +0100 +--- doc/sample-xpdfrc.orig 2005-08-17 05:34:30.000000000 +0000 ++++ doc/sample-xpdfrc @@ -4,7 +4,7 @@ # # The Xpdf tools look for a config file in two places: @@ -11,9 +11,9 @@ $NetBSD: patch-ai,v 1.1 2003/03/25 14:02:42 salo Exp $ # # This sample config file demonstrates some of the more common # configuration options. Everything here is commented out. You -@@ -46,20 +46,20 @@ - # this, but you'll need to adjust this to point to wherever - # ghostscript is installed on your system. +@@ -29,20 +29,20 @@ + # installed in a "standard" location, xpdf will find them + # automatically.) -#displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb -#displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb @@ -46,7 +46,7 @@ $NetBSD: patch-ai,v 1.1 2003/03/25 14:02:42 salo Exp $ # If you need to display PDF files that refer to non-embedded fonts, # you should add one or more fontDir options to point to the -@@ -67,7 +67,7 @@ +@@ -50,7 +50,7 @@ # .pfb, and .ttf files in those directories (other files will simply # be ignored). diff --git a/print/xpdf/patches/patch-aj b/print/xpdf/patches/patch-aj index 3583afd5cb8..66b3feea843 100644 --- a/print/xpdf/patches/patch-aj +++ b/print/xpdf/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2003/03/25 14:02:43 salo Exp $ +$NetBSD: patch-aj,v 1.2 2005/09/07 15:19:08 adam Exp $ ---- doc/xpdf.1.orig 2003-03-21 08:01:01.000000000 +0100 -+++ doc/xpdf.1 2003-03-25 12:33:20.000000000 +0100 -@@ -40,7 +40,7 @@ +--- doc/xpdf.1.orig 2005-08-17 05:34:30.000000000 +0000 ++++ doc/xpdf.1 +@@ -41,7 +41,7 @@ xpdf .SH CONFIGURATION FILE Xpdf reads a configuration file at startup. It first tries to find the user's private config file, ~/.xpdfrc. If that doesn't exist, it diff --git a/print/xpdf/patches/patch-ak b/print/xpdf/patches/patch-ak index 29261aebecf..b71a8848b1c 100644 --- a/print/xpdf/patches/patch-ak +++ b/print/xpdf/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.2 2004/03/03 10:50:09 adam Exp $ +$NetBSD: patch-ak,v 1.3 2005/09/07 15:19:08 adam Exp $ ---- doc/xpdfrc.5.orig 2004-01-22 01:26:44.000000000 +0000 +--- doc/xpdfrc.5.orig 2005-08-17 05:34:30.000000000 +0000 +++ doc/xpdfrc.5 @@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf .I .xpdfrc @@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.2 2004/03/03 10:50:09 adam Exp $ if it exists. (This is its default location; depending on build options, it may be placed elsewhere.) On Win32 systems, the .I xpdfrc -@@ -405,33 +405,33 @@ The following is a sample xpdfrc file. +@@ -407,28 +407,28 @@ The following is a sample xpdfrc file. .nf # from the Thai support package @@ -27,7 +27,6 @@ $NetBSD: patch-ak,v 1.2 2004/03/03 10:50:09 adam Exp $ +cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1 # use the Base-14 Type 1 fonts from ghostscript - # (note that this overrides the displayFontX command above) -displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb -displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb -displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb @@ -58,14 +57,8 @@ $NetBSD: patch-ak,v 1.2 2004/03/03 10:50:09 adam Exp $ +displayFontT1 ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb # use the Bakoma Type 1 fonts --# (this assumes they happen to be installed in /usr/local/fonts/bakoma) --fontDir /usr/local/fonts/bakoma -+# (this assumes they happen to be installed in @PREFIX@/share/tex-contrib/fonts/BaKoMa) -+fontDir @PREFIX@/share/tex-contrib/fonts/BaKoMa - - # set some PostScript options - psPaperSize letter -@@ -458,7 +458,7 @@ urlCommand "netscape -remote 'openU + # (this assumes they happen to be installed in /usr/local/fonts/bakoma) +@@ -459,7 +459,7 @@ urlCommand "netscape -remote 'openU .fi .SH FILES .TP diff --git a/print/xpdf/patches/patch-al b/print/xpdf/patches/patch-al index 762d132860f..71a03090096 100644 --- a/print/xpdf/patches/patch-al +++ b/print/xpdf/patches/patch-al @@ -1,16 +1,19 @@ -$NetBSD: patch-al,v 1.1 2004/03/03 10:50:59 adam Exp $ +$NetBSD: patch-al,v 1.2 2005/09/07 15:19:08 adam Exp $ ---- xpdf/GlobalParams.cc.orig 2004-03-03 10:26:05.000000000 +0000 +--- xpdf/GlobalParams.cc.orig 2005-08-17 05:34:31.000000000 +0000 +++ xpdf/GlobalParams.cc -@@ -81,9 +81,9 @@ static struct { +@@ -106,11 +106,10 @@ static char *displayFontDirs[] = { }; - + #else static char *displayFontDirs[] = { - "/usr/share/ghostscript/fonts", + PREFIX"/share/ghostscript/fonts", "/usr/local/share/ghostscript/fonts", - "/usr/share/fonts/default/Type1", +- "/usr/share/fonts/default/ghostscript", +- "/usr/share/fonts/type1/gsfonts", + "/usr/X11R6/lib/X11/fonts/Type1", ++ PREFIX"/xorg/lib/X11/fonts/Type1", NULL }; - + #endif diff --git a/print/xpdf/patches/patch-an b/print/xpdf/patches/patch-an index 63dd705a9b0..5ef9330d22c 100644 --- a/print/xpdf/patches/patch-an +++ b/print/xpdf/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2004/04/27 19:45:59 adam Exp $ +$NetBSD: patch-an,v 1.2 2005/09/07 15:19:08 adam Exp $ ---- configure.orig Tue Apr 27 21:07:38 2004 +--- configure.orig 2005-08-17 05:34:30.000000000 +0000 +++ configure -@@ -9124,6 +9124,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -9128,6 +9128,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -10,7 +10,7 @@ $NetBSD: patch-an,v 1.1 2004/04/27 19:45:59 adam Exp $ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -@@ -9159,6 +9160,7 @@ _ACEOF +@@ -9163,6 +9164,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -18,7 +18,7 @@ $NetBSD: patch-an,v 1.1 2004/04/27 19:45:59 adam Exp $ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -@@ -9483,6 +9485,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -9495,6 +9497,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -26,7 +26,7 @@ $NetBSD: patch-an,v 1.1 2004/04/27 19:45:59 adam Exp $ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -@@ -9518,6 +9521,7 @@ _ACEOF +@@ -9530,6 +9533,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/print/xpdf/patches/patch-ao b/print/xpdf/patches/patch-ao deleted file mode 100644 index 76f8d8e44b6..00000000000 --- a/print/xpdf/patches/patch-ao +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2004/04/27 19:45:59 adam Exp $ - ---- splash/SplashFTFontFile.h.orig Tue Apr 27 21:32:38 2004 -+++ splash/SplashFTFontFile.h -@@ -15,6 +15,7 @@ - #pragma interface - #endif - -+#include <ft2build.h> - #include <freetype/freetype.h> - #include "SplashFontFile.h" - diff --git a/print/xpdf/patches/patch-ap b/print/xpdf/patches/patch-ap deleted file mode 100644 index 73eaec26848..00000000000 --- a/print/xpdf/patches/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2004/04/27 19:45:59 adam Exp $ - ---- splash/SplashFTFontEngine.h.orig Tue Apr 27 21:35:08 2004 -+++ splash/SplashFTFontEngine.h -@@ -15,6 +15,7 @@ - #pragma interface - #endif - -+#include <ft2build.h> - #include <freetype/freetype.h> - #include "gtypes.h" - diff --git a/print/xpdf/patches/patch-ar b/print/xpdf/patches/patch-ar index f5cdc2ae497..0f1fcca2a8d 100644 --- a/print/xpdf/patches/patch-ar +++ b/print/xpdf/patches/patch-ar @@ -1,10 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2005/08/12 12:27:30 salo Exp $ +$NetBSD: patch-ar,v 1.2 2005/09/07 15:19:08 adam Exp $ -Fix for CAN-2005-2097, from Ubuntu and RedHat. - ---- fofi/FoFiTrueType.cc.orig 2004-01-22 02:26:44.000000000 +0100 -+++ fofi/FoFiTrueType.cc 2005-08-12 13:49:51.000000000 +0200 -@@ -1343,6 +1343,27 @@ +--- fofi/FoFiTrueType.cc.orig 2005-08-17 05:34:30.000000000 +0000 ++++ fofi/FoFiTrueType.cc +@@ -1652,6 +1652,27 @@ void FoFiTrueType::parse() { return; } @@ -31,4 +29,4 @@ Fix for CAN-2005-2097, from Ubuntu and RedHat. + // read the post table readPostTable(); - if (!parsedOk) { + } diff --git a/print/xpdf/patches/patch-as b/print/xpdf/patches/patch-as deleted file mode 100644 index 49803fadd3c..00000000000 --- a/print/xpdf/patches/patch-as +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-as,v 1.1 2005/08/12 12:27:30 salo Exp $ - -Fix for CAN-2005-2097, from Ubuntu and RedHat. - ---- xpdf/SplashOutputDev.cc.orig 2004-01-22 02:26:45.000000000 +0100 -+++ xpdf/SplashOutputDev.cc 2005-08-12 13:54:26.000000000 +0200 -@@ -621,16 +621,19 @@ - } - break; - case fontTrueType: -- if (!(ff = FoFiTrueType::load(fileName->getCString()))) { -- goto err2; -- } -+ if ((ff = FoFiTrueType::load(fileName->getCString()))) { - codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); -+ n = 256; - delete ff; -+ } else { -+ codeToGID = NULL; -+ n = 0; -+ } - if (!(fontFile = fontEngine->loadTrueTypeFont( - id, - fileName->getCString(), - fileName == tmpFileName, -- codeToGID, 256))) { -+ codeToGID, n))) { - error(-1, "Couldn't create a font for '%s'", - gfxFont->getName() ? gfxFont->getName()->getCString() - : "(unnamed)"); |