summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-09-19 01:45:42 +0000
committerjlam <jlam@pkgsrc.org>2002-09-19 01:45:42 +0000
commitaff1f33c88a8c90ba9174f357f6edda8ed82cc28 (patch)
treec272a3554cc057f63869bb00d571fbc7adf859e8
parent124637723bd9b0337af489adc62d53a8597f5a58 (diff)
downloadpkgsrc-aff1f33c88a8c90ba9174f357f6edda8ed82cc28.tar.gz
Updated print/xpdf to version 1.01. Changes from version 1.00 include:
Honoring ${PKG_SYSCONFDIR} for location of xpdfrc. Implemented Type 3 fonts. Implemented PostScript CID font embedding; added a psEmbedCIDPostScriptFonts option. Implemented PostScript 16-bit font substitution; added psNamedFont16 and psFont16 options. Moved the initialZoom setting from X resources to the xpdfrc file. Implemented the radial shading type in the sh (shaded fill) operator. [Thanks to Mike Sweet.] Added an 'include' command to the xpdfrc format. Added the displayNamedCIDFontX option so different fonts can be used within one character collection. Implemented stroked text in XOutputDev (with t1lib and FreeType2). [Thanks to Leonard Rosenthol.] Implemented stroked text in PSOutputDev. Added a built-in Unicode map for UCS-2. PSOutputDev will now embed external TrueType fonts in addition to external Type 1 fonts. Added the Big5ascii Unicode map to the Chinese-traditional support package (maps 7-bit ASCII straight through). [Thanks to Lawrence Lai.] Modified the EUC-CN and EUC-JP encodings to pass 7-bit ASCII straight through. [Thanks to Lawrence Lai.] In the code that guesses character names (for font subsets), also handle names of the form 'ABnnn'. [Thanks to Colin Granville.] Tweak the Type 1 font bbox code to look at the bboxes in both the PDF font object and the embedded font file. Added an optional displayCIDFontX entry for one of the Arphic TrueType fonts in the traditional Chinese 'add-to-xpdfrc' file. Added psASCIIHex parameter. Added the GBK Unicode map to the simplified Chinese language pack. Pdftotext now opens the text file in binary mode to avoid Microsoft's annoying automatic end-of-line translation stuff. Added an executeCommand function in goo/gfile.cc. [Thanks to Mikhail Kruk.] The %ALDImagePosition OPI comment was wrong if the page was scaled to a different paper size. The OPI code was saving the default transform matrix before calling setpagedevice, which can change the matrix. PSOutputDev now handles PostScript XObjects.
-rw-r--r--print/xpdf/Makefile16
-rw-r--r--print/xpdf/PLIST21
-rw-r--r--print/xpdf/distinfo11
-rw-r--r--print/xpdf/patches/patch-aa49
-rw-r--r--print/xpdf/patches/patch-ab19
-rw-r--r--print/xpdf/patches/patch-ac19
-rw-r--r--print/xpdf/patches/patch-ad16
7 files changed, 54 insertions, 97 deletions
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 846b81b7093..20f831ac022 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:34 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/19 01:45:42 jlam Exp $
#
-DISTNAME= xpdf-1.00
-PKGREVISION= 1 # because of switch to freetype2
+DISTNAME= xpdf-1.01
CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/}
@@ -17,8 +16,9 @@ CONFLICTS= xpdf-crypto-[0-9]*
USE_BUILDLINK2= YES
USE_X11BASE= YES
-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
CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
@@ -30,8 +30,16 @@ MAKE_ENV+= SED="${SED}" ECHO="${ECHO}"
CONFIGURE_ARGS+= --enable-a4-paper
.endif
+EGDIR= ${PREFIX}/share/examples/xpdf
+CONF_FILES= ${EGDIR}/xpdfrc ${PKG_SYSCONFDIR}/xpdfrc
+
.include "../../fonts/t1lib/buildlink2.mk"
.include "../../graphics/freetype2/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
+CXXFLAGS:= ${CXXFLAGS:N-O[0-9]*}
+.endif
diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST
index 68f1ad35339..338199a605a 100644
--- a/print/xpdf/PLIST
+++ b/print/xpdf/PLIST
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:35 jlam Exp $
-bin/xpdf
+@comment $NetBSD: PLIST,v 1.5 2002/09/19 01:45:42 jlam Exp $
bin/pdffonts
-bin/pdftops
-bin/pdftotext
+bin/pdfimages
bin/pdfinfo
bin/pdftopbm
-bin/pdfimages
-etc/xpdfrc
-man/man1/xpdf.1
+bin/pdftops
+bin/pdftotext
+bin/xpdf
man/man1/pdffonts.1
-man/man1/pdftops.1
-man/man1/pdftotext.1
+man/man1/pdfimages.1
man/man1/pdfinfo.1
man/man1/pdftopbm.1
-man/man1/pdfimages.1
+man/man1/pdftops.1
+man/man1/pdftotext.1
+man/man1/xpdf.1
man/man5/xpdfrc.5
+share/examples/xpdf/xpdfrc
+@dirrm share/examples/xpdf
diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo
index 8a3330d213c..f4c7dd3615f 100644
--- a/print/xpdf/distinfo
+++ b/print/xpdf/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/03/23 16:34:52 simonb Exp $
+$NetBSD: distinfo,v 1.7 2002/09/19 01:45:42 jlam Exp $
-SHA1 (xpdf-1.00.tar.gz) = 01aae7c29a916b809bc5fc29f279b97cf4b56169
-Size (xpdf-1.00.tar.gz) = 397750 bytes
-SHA1 (patch-aa) = 2b1a36ce71afb4c7ad2a84ac70f46fe5ffea3687
-SHA1 (patch-ab) = e8579824f1eb5517945dadf15ddf17142a075fc7
-SHA1 (patch-ac) = 529f42dda29f03d742fd92b5bdedc4c1cd93d9dc
-SHA1 (patch-ad) = 087ca7aed69895182725b834f643d74b2df51cce
+SHA1 (xpdf-1.01.tar.gz) = c02cf4efb90a107364b6f7d20bed45bf8fe09526
+Size (xpdf-1.01.tar.gz) = 441968 bytes
+SHA1 (patch-aa) = bf57c8955a25fc723fdcc86acc2055876c39a686
diff --git a/print/xpdf/patches/patch-aa b/print/xpdf/patches/patch-aa
index 1366e3e9ca4..7ba0e09d3c6 100644
--- a/print/xpdf/patches/patch-aa
+++ b/print/xpdf/patches/patch-aa
@@ -1,25 +1,30 @@
-$NetBSD: patch-aa,v 1.3 2002/02/03 05:28:51 mjl Exp $
+$NetBSD: patch-aa,v 1.4 2002/09/19 01:45:43 jlam Exp $
---- xpdf/Makefile.in.orig Sat Feb 2 00:15:45 2002
-+++ xpdf/Makefile.in Sun Feb 3 06:15:00 2002
-@@ -21,6 +21,8 @@
+--- Makefile.in.orig Mon May 20 23:40:09 2002
++++ Makefile.in
+@@ -13,6 +13,7 @@ DESTDIR =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ srcdir = @srcdir@
++exampledir = @prefix@/share/examples/xpdf
- LDFLAGS = @LDFLAGS@
-
-+CXXFLAGS_NOOPT!= ${ECHO} ${CXXFLAGS} | ${SED} 's/-O[0-9]*//g'
-+
- XLIBS = @Xpm_LIBS@ @t1_LIBS@ @freetype_LIBS@ @freetype2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@
-
- OTHERLIBS = @LIBS@ @libpaper_LIBS@
-@@ -36,6 +38,11 @@
-
- .cc.o:
- $(CXX) $(CXXFLAGS) -c $<
-+
-+.if (${MACHINE_ARCH} == "mipsel")
-+XOutputDev.o: XOutputDev.cc
-+ ${CXX} ${CXXFLAGS_NOOPT} -c XOutputDev.cc
-+.endif
-
- #------------------------------------------------------------------------
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -79,12 +80,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
+- -mkdir -p $(DESTDIR)@sysconfdir@
+- @if test ! -f $(DESTDIR)@sysconfdir@/xpdfrc; then \
+- echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc"; \
+- $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc; \
++ -mkdir -p $(DESTDIR)$(exampledir)
++ @if test ! -f $(DESTDIR)$(exampledir)/xpdfrc; then \
++ echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)$(exampledir)/xpdfrc"; \
++ $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)$(exampledir)/xpdfrc; \
+ else \
+- echo "# not overwriting the existing $(DESTDIR)@sysconfdir@/xpdfrc"; \
++ echo "# not overwriting the existing $(DESTDIR)$(exampledir)/xpdfrc"; \
+ fi
+ clean:
diff --git a/print/xpdf/patches/patch-ab b/print/xpdf/patches/patch-ab
deleted file mode 100644
index 52f448a26d5..00000000000
--- a/print/xpdf/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/03/23 14:08:12 simonb Exp $
-
---- xpdf/TextOutputDev.cc.orig Sat Feb 2 10:15:45 2002
-+++ xpdf/TextOutputDev.cc
-@@ -154,8 +154,12 @@
- dx -= dx2;
- dy -= dy2;
- state->transformDelta(dx, dy, &w1, &h1);
-- w1 /= uLen;
-- h1 /= uLen;
-+ if (uLen == 0) {
-+ w1 = h1 = 0.;
-+ } else {
-+ w1 /= uLen;
-+ h1 /= uLen;
-+ }
- for (i = 0; i < uLen; ++i) {
- curStr->addChar(state, x1 + i*w1, y1 + i*h1, w1, h1, u[i]);
- }
diff --git a/print/xpdf/patches/patch-ac b/print/xpdf/patches/patch-ac
deleted file mode 100644
index ab275f8c5cd..00000000000
--- a/print/xpdf/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/03/23 16:32:33 simonb Exp $
-
---- xpdf/XOutputDev.cc.orig Sat Feb 2 10:15:45 2002
-+++ xpdf/XOutputDev.cc
-@@ -399,8 +399,12 @@
- for (i = 0; i < uLen; ++i) {
- n += xUMap->mapUnicode(u[i], buf, sizeof(buf));
- }
-- dx1 = dx / n;
-- dy1 = dy / n;
-+ if (n == 0) {
-+ dx1 = dy1 = 0.;
-+ } else {
-+ dx1 = dx / n;
-+ dy1 = dy / n;
-+ }
- k = 0;
- for (i = 0; i < uLen; ++i) {
- m = xUMap->mapUnicode(u[i], buf, sizeof(buf));
diff --git a/print/xpdf/patches/patch-ad b/print/xpdf/patches/patch-ad
deleted file mode 100644
index 475e4801d83..00000000000
--- a/print/xpdf/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/03/23 16:34:54 simonb Exp $
-
---- goo/gfile.cc.orig Sat Feb 2 10:15:45 2002
-+++ goo/gfile.cc
-@@ -494,9 +494,11 @@
- }
- *name = new GString(s);
- s = (*name)->getCString();
-+#if 0
- if ((p = strrchr(s, '.'))) {
- (*name)->del(p - s, (*name)->getLength() - (p - s));
- }
-+#endif
- (*name)->append(ext);
- fd = open((*name)->getCString(), O_WRONLY | O_CREAT | O_EXCL, 0600);
- } else {