upgrade to xpdf 0.91

This commit is contained in:
brad 2000-08-30 23:07:30 +00:00
parent 20682fd5e2
commit fa4e599998
8 changed files with 70 additions and 64 deletions

View File

@ -1,17 +1,13 @@
# $OpenBSD: Makefile,v 1.13 2000/07/04 13:12:04 fgsch Exp $
# $OpenBSD: Makefile,v 1.14 2000/08/30 23:07:30 brad Exp $
DISTNAME= xpdf-0.90
DISTNAME= xpdf-0.91
CATEGORIES= textproc x11
NEED_VERSION= 1.311
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} \
ftp://ftp.duke.edu/pub/X11/contrib/applications/ \
ftp://ftp.foolabs.com/pub/xpdf/
MASTER_SITES0= http://www.fefe.de/
NEED_VERSION= 1.320
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/xpdf
EXTRACT_SUFX= .tgz
PATCH_DIST_STRIP= -p1
PATCHFILES= xpdf-0.90-fefe-diff2.gz:0
HOMEPAGE= http://www.foolabs.com/xpdf/
MAINTAINER= eep@inconnect.com
@ -20,8 +16,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS= --with-gzip
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --with-gzip --without-freetype-library
post-install:
@cd ${PREFIX}/bin && \

View File

@ -1,6 +1,6 @@
MD5 (xpdf-0.90-fefe-diff2.gz) = 33339e6b598f4e3caadf2a4f20fe4734
MD5 (xpdf-0.90.tgz) = a7678b64713a466279b61c28ba01134b
MD5 (xpdf-0.91.tgz) = dd675fe691ba7341f2f581e67d724bcb
RMD160 (xpdf-0.90-fefe-diff2.gz) = 3459814cb4c72cf53b8158efa0ab918da8893635
RMD160 (xpdf-0.90.tgz) = 396082803e18e23337e4b58e76c210856252e9f4
RMD160 (xpdf-0.91.tgz) = 4229991860f83a285330d313e8e5e4399ddebc47
SHA1 (xpdf-0.90-fefe-diff2.gz) = 3eb9b616a2747d62c9e9c8d9c93a67cdeb62b67e
SHA1 (xpdf-0.90.tgz) = 2db32ea13d04dc4e3f07659330150371c7d71072
SHA1 (xpdf-0.91.tgz) = a8938216d1f3f96dba901875409e0d3a6bed4ac4

View File

@ -0,0 +1,46 @@
--- Makefile.in.orig Wed Aug 30 18:36:22 2000
+++ Makefile.in Wed Aug 30 18:38:50 2000
@@ -8,6 +8,8 @@
SHELL = /bin/sh
+DESTDIR =
+
prefix = @prefix@
exec_prefix = @exec_prefix@
srcdir = @srcdir@
@@ -51,20 +53,20 @@
dummy:
install: dummy
- -mkdir -p @bindir@
-@X@ $(INSTALL_PROGRAM) xpdf/xpdf$(EXE) @bindir@/xpdf$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) @bindir@/pdftops$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) @bindir@/pdftotext$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) @bindir@/pdfinfo$(EXE)
-@X@ $(INSTALL_PROGRAM) xpdf/pdftopbm$(EXE) @bindir@/pdftopbm$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) @bindir@/pdfimages$(EXE)
- -mkdir -p @mandir@/man1
-@X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 @mandir@/man1/xpdf.1
- $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 @mandir@/man1/pdftops.1
- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 @mandir@/man1/pdftotext.1
- $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 @mandir@/man1/pdfinfo.1
-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftopbm.1 @mandir@/man1/pdftopbm.1
- $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 @mandir@/man1/pdfimages.1
+ -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)
+@X@ $(INSTALL_PROGRAM) xpdf/pdftopbm$(EXE) $(DESTDIR)@bindir@/pdftopbm$(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
+ $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
+ $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
+ $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
+@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftopbm.1 $(DESTDIR)@mandir@/man1/pdftopbm.1
+ $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
clean:
-cd goo; $(MAKE) clean

View File

@ -1,26 +0,0 @@
--- xpdf/Stream.cc.orig Wed Sep 15 13:01:21 1999
+++ xpdf/Stream.cc Wed Sep 15 13:02:02 1999
@@ -836,6 +836,7 @@
void LZWStream::reset() {
FILE *f;
+ int fd;
str->reset();
bufPtr = bufEnd = buf;
@@ -857,12 +858,13 @@
strcpy(zCmd, uncompressCmd);
strcat(zCmd, " ");
zName = zCmd + strlen(zCmd);
- tmpnam(zName);
+ strncat(zName,"/tmp/xpdf.XXXXXX",strlen("/tmp/xpdf.XXXXXX"));
#ifdef _MSC_VER
zName[strlen(zName) - 2] = '\0';
#endif
strcat(zName, ".Z");
- if (!(f = fopen(zName, "wb"))) {
+ fd=mkstemps(zName,strlen(".Z"));
+ if (!(f = fdopen(fd, "w"))) {
error(getPos(), "Couldn't open temporary file '%s'", zName);
return;
}

View File

@ -1,10 +0,0 @@
--- ./configure.orig Wed Sep 15 12:33:23 1999
+++ ./configure Wed Sep 15 12:33:33 1999
@@ -2550,7 +2550,6 @@
echo "$ac_t""$xpdf_cv_func_select_arg" 1>&6
if test "$xpdf_cv_func_select_arg" != yes; then
cat >> confdefs.h <<\EOF
-#define SELECT_TAKES_INT 1
EOF
fi

View File

@ -1,14 +0,0 @@
--- ltk/LTKApp.cc.orig Mon Aug 2 22:37:20 1999
+++ ltk/LTKApp.cc Wed Sep 15 12:25:30 1999
@@ -25,10 +25,8 @@
// needed by some systems for fd_set
#include <sys/select.h>
#endif
-#ifdef HAVE_SYS_BSDTYPES_H
// needed by some systems for fd_set
-#include <sys/bsdtypes.h>
-#endif
+#include <sys/types.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>

View File

@ -0,0 +1,12 @@
--- configure.in.orig Wed Aug 30 17:38:50 2000
+++ configure.in Wed Aug 30 17:41:01 2000
@@ -173,7 +173,8 @@
dnl # include file (e.g., in cygwin 1.1.2).
AC_CACHE_CHECK([for mkstemp],
xpdf_cv_func_mkstemp,
-[AC_TRY_COMPILE([#include <stdlib.h>],
+[AC_TRY_COMPILE([#include <stdlib.h>
+#include <unistd.h>],
[mkstemp("foo");],
xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)])
if test "$xpdf_cv_func_mkstemp" = yes; then

View File

@ -1,3 +1,5 @@
Xpdf is a PDF (also known as Acrobat files) for the X window system.
It includes other pdf programs such as pdftotext, pdftoops, etc.
Xpdf does not use motif or Xt libraries it only uses standard X fonts.
WWW: ${HOMEPAGE}