cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version 0.7a

Browse Source 
Thanks to toddf@ for telling me about the new version.
This commit is contained in:
angelos 1998-05-16 00:28:27 +00:00
parent 9a41a5fc25
commit 6c5ec374ec
4 changed files with 50 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/xpdf/Makefile
View File

@ -3,15 +3,16 @@
# Date created: December 2, 1997
# Whom: angelos@openbsd.org
#
# $OpenBSD: Makefile,v 1.1.1.1 1997/12/03 03:13:16 angelos Exp $
# $OpenBSD: Makefile,v 1.2 1998/05/16 00:28:27 angelos Exp $
#
DISTNAME= xpdf-0.7
DISTNAME= xpdf-0.7a
CATEGORIES= graphics print
MASTER_SITES= ftp://ftp.aimnet.com/pub/users/derekn/xpdf/
MAINTAINER= angelos@openbsd.org
GNU_CONFIGURE= yes
USE_X11= yes
MAN1= xpdf.1 pdftops.1 pdftotext.1

2
graphics/xpdf/files/md5
View File

@ -1 +1 @@
MD5 (xpdf-0.7.tar.gz) = a871cade04c8c9e55ff7e45c5ff49b4b
MD5 (xpdf-0.7a.tar.gz) = 3b6ed5783d1f7c53a3983d404ec5c818

131
graphics/xpdf/patches/patch-aa
View File

@ -1,88 +1,49 @@
*** Makefile.config.orig Fri May 30 03:29:08 1997
--- Makefile.config Fri May 30 03:31:38 1997
*** xpdf/Stream.cc.orig Fri May 15 20:13:58 1998
--- xpdf/Stream.cc Fri May 15 20:18:10 1998
***************
*** 44,50 ****
#------------------------------------------------------------------------
*** 498,503 ****
--- 498,505 ----
# Binaries and man pages will be installed here:
! PREFIX = /usr/local
void LZWStream::reset() {
FILE *f;
+ int fdfd;
+ char *zzzz;
# SCO puts stuff here:
#PREFIX = /u
--- 44,50 ----
#------------------------------------------------------------------------
# Binaries and man pages will be installed here:
! PREFIX ?= /usr/X11R6
# SCO puts stuff here:
#PREFIX = /u
*************** EXE =
*** 149,155 ****
#CFLAGS2 = -O2 -Wall -DNO_XPM
# If you're using g++ 2.7.x, you'll want to use -Wno-unused:
! CFLAGS2 = -O2 -Wall -Wno-unused -DNO_XPM
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
#CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
--- 149,155 ----
#CFLAGS2 = -O2 -Wall -DNO_XPM
# If you're using g++ 2.7.x, you'll want to use -Wno-unused:
! CFLAGS2 = -O2 -pipe -Wall -Wno-unused -I${X11BASE}/include
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
#CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
*************** CXXFLAGS2 = $(CFLAGS2)
*** 197,209 ****
#------------------------------------------------------------------------
# For most systems, just grab the X library:
! XLIBS = -lX11
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
#XLIBS = -L/usr/X11R6/lib -lX11
# For official FreeBSD port (using the FreeBSD makefiles):
! #XLIBS = -L$(X11BASE)/lib -lX11
# Some BSDI systems may need -lipc (?):
#XLIBS = -L/usr/X11R6/lib -lX11 -lipc
--- 197,209 ----
#------------------------------------------------------------------------
# For most systems, just grab the X library:
! #XLIBS = -lX11
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
#XLIBS = -L/usr/X11R6/lib -lX11
# For official FreeBSD port (using the FreeBSD makefiles):
! XLIBS = -L$(X11BASE)/lib -lX11
# Some BSDI systems may need -lipc (?):
#XLIBS = -L/usr/X11R6/lib -lX11 -lipc
*************** XLIBS = -lX11
*** 242,251 ****
#------------------------------------------------------------------------
# This is needed for the color icon:
! #XPMLIB = -lXpm
# Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2):
! XPMLIB =
#------------------------------------------------------------------------
# C++ compilation rule.
--- 242,251 ----
#------------------------------------------------------------------------
# This is needed for the color icon:
! XPMLIB = -lXpm
# Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2):
! #XPMLIB =
#------------------------------------------------------------------------
# C++ compilation rule.
str->reset();
bufPtr = bufEnd = buf;
***************
*** 513,524 ****
strcpy(zCmd, uncompressCmd);
strcat(zCmd, " ");
zName = zCmd + strlen(zCmd);
! tmpnam(zName);
strcat(zName, ".Z");
! if (!(f = fopen(zName, FOPEN_WRITE_BIN))) {
error(getPos(), "Couldn't open temporary file '%s'", zName);
return;
}
dumpFile(f);
fclose(f);
#ifdef HAVE_POPEN
--- 515,535 ----
strcpy(zCmd, uncompressCmd);
strcat(zCmd, " ");
zName = zCmd + strlen(zCmd);
! strcpy(zName, "/tmp/xpXXXXXXXX");
! zzzz = strdup(zName);
! fdfd = mkstemp(zzzz);
strcat(zName, ".Z");
! if (!(f = fdopen(fdfd, FOPEN_WRITE_BIN))) {
error(getPos(), "Couldn't open temporary file '%s'", zName);
+ free(zzzz);
return;
}
+ if (rename(zzzz, zName) == -1) {
+ error(getPos(), "Couldn't rename temporary file '%s'", zName);
+ free(zzzz);
+ return;
+ }
+ free(zzzz);
dumpFile(f);
fclose(f);
#ifdef HAVE_POPEN

49
graphics/xpdf/patches/patch-ab
View File

@ -1,49 +0,0 @@
*** xpdf/Stream.cc.orig Mon May 26 02:28:46 1997
--- xpdf/Stream.cc Tue Dec 2 22:10:07 1997
***************
*** 489,494 ****
--- 489,496 ----
void LZWStream::reset() {
FILE *f;
+ int fdfd;
+ char *zzzz;
str->reset();
bufPtr = bufEnd = buf;
***************
*** 504,515 ****
strcpy(zCmd, uncompressCmd);
strcat(zCmd, " ");
zName = zCmd + strlen(zCmd);
! tmpnam(zName);
strcat(zName, ".Z");
! if (!(f = fopen(zName, "w"))) {
error(getPos(), "Couldn't open temporary file '%s'", zName);
return;
}
dumpFile(f);
fclose(f);
#ifdef NO_POPEN
--- 506,526 ----
strcpy(zCmd, uncompressCmd);
strcat(zCmd, " ");
zName = zCmd + strlen(zCmd);
! strcpy(zName, "/tmp/xpXXXXXX");
! fdfd = mkstemp(zName);
! zzzz = strdup(zName);
strcat(zName, ".Z");
! if (!(f = fdopen(fdfd, "w"))) {
error(getPos(), "Couldn't open temporary file '%s'", zName);
+ free(zzzz);
return;
}
+ if (rename(zzzz, zName) == -1) {
+ error(getPos(), "Couldn't rename temporary file '%s'", zName);
+ free(zzzz);
+ return;
+ }
+ free(zzzz);
dumpFile(f);
fclose(f);
#ifdef NO_POPEN