1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Update to 6.52

PR:		31724
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
Dmitry Sivachenko 2001-11-04 07:35:38 +00:00
parent 9b617e3efa
commit 9c45f91fe6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=49552
10 changed files with 200 additions and 106 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= ghostscript
PORTVERSION= 6.51
PORTVERSION= 6.52
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU} \
${MASTER_SITE_SOURCEFORGE} \
@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
http://www.gelhaus.net/hp880c/1.4beta/ \
http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
http://www.harsch.net/Download/ \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs651/ \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs652/ \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
MASTER_SITE_SUBDIR= ${PORTNAME} gimp-print hpinkjet
PKGNAMESUFFIX= -gnu
@ -86,7 +86,7 @@ HPDJ_MAN1= gs-hpdj.1
# additional driver for HP PCL3 Printers, by Martin Lottermoser
# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
PCL3= pcl3
PCL3_VERS= 3.2
PCL3_VERS= 3.3
PCL3_NAME= ${PCL3}-${PCL3_VERS}
PCL3_SRC= ${PCL3_NAME}.tar.gz
PCL3_MAN1= gs-pcl3.1 pcl3opts.1
@ -165,10 +165,6 @@ post-extract:
post-patch:
${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
${WRKSRC}/src/unix-gcc.mak
find ${WRKSRC}/src -name '*.[ch]' | xargs ${PERL} -pi -e \
's|pputc|stream_putc|g; \
s|pwrite|stream_write|g ; \
s|pputs|stream_puts|g'
# for HPinkjet driver
find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
's|#include <malloc.h>||g; \
@ -184,7 +180,7 @@ pre-configure:
>> ${WRKSRC}/src/contrib.mak
# for PCL3 driver
${ECHO_MSG} ">>> adding ${PCL3} driver to contrib.mak ..."
${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.51.add \
>> ${WRKSRC}/src/contrib.mak
# for gimp-print
${ECHO_MSG} ">>> creating symlinks for ${GPRINT_DESC} ..."
@ -249,7 +245,7 @@ post-install:
${DATADIR}/${PORTVERSION}/hpdj
.endfor
# for PCL3 driver
${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
.for i in ${PCL3_MAN1}
${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
.endfor

View File

@ -1,10 +1,10 @@
MD5 (ghostscript/ghostscript-6.51.tar.bz2) = 6b6d2123daaa1d217aadcbba7f2d6179
MD5 (ghostscript/ghostscript-6.52.tar.bz2) = 5a1b698b8fbece1e23e4d8d9ff552762
MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
MD5 (ghostscript/pcl3-3.2.tar.gz) = c98b9404dfc47d5ff907f9ad81dcbd46
MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
MD5 (ghostscript/print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8

View File

@ -1,34 +1,60 @@
--- src/gp_unifs.c.orig Tue Jun 5 15:38:58 2001
+++ src/gp_unifs.c Wed Jun 20 04:18:03 2001
@@ -29,6 +29,7 @@
--- src/gp_unifs.c.orig Tue Jun 5 15:31:44 2001
+++ src/gp_unifs.c Sun Jul 15 22:57:50 2001
@@ -28,6 +27,8 @@
#include "gsutil.h" /* for string_match */
#include "stat_.h"
#include "dirent_.h"
+#include "unistd_.h"
+#include <stdlib.h> /* for mkstemp/mktemp */
#include <sys/param.h> /* for MAXPATHLEN */
+#include <unistd.h>
/* Some systems (Interactive for example) don't define MAXPATHLEN,
* so we define it here. (This probably should be done via a Config-Script.)
@@ -59,6 +60,8 @@
@@ -57,22 +58,44 @@
FILE *
gp_open_scratch_file(const char *prefix, char fname[gp_file_name_sizeof],
const char *mode)
{ /* The -8 is for XXXXXX plus a possible final / and -. */
int len = gp_file_name_sizeof - strlen(prefix) - 8;
+ int fd;
+ FILE *f;
if (gp_gettmpdir(fname, &len) != 0)
-{ /* The -8 is for XXXXXX plus a possible final / and -. */
- int len = gp_file_name_sizeof - strlen(prefix) - 8;
-
- if (gp_gettmpdir(fname, &len) != 0)
+{ /* The -8 is for XXXXXX plus a possible final / and -. */
+ int prefix_length = strlen(prefix);
+ int len = gp_file_name_sizeof - prefix_length - 8;
+
+ if (gp_file_name_is_absolute(prefix, prefix_length))
+ *fname = 0;
+ else if (gp_gettmpdir(fname, &len) != 0)
strcpy(fname, "/tmp/");
@@ -71,8 +74,12 @@
else {
if (strlen(fname) != 0 && fname[strlen(fname) - 1] != '/')
strcat(fname, "/");
}
+ if (strlen(fname) + prefix_length + 8 >= gp_file_name_sizeof)
+ return 0; /* file name too long */
strcat(fname, prefix);
/* Prevent trailing X's in path from being converted by mktemp. */
if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
strcat(fname, "-");
strcat(fname, "XXXXXX");
- mktemp(fname);
- return gp_fopentemp(fname, mode);
+ fd = mkstemp(fname);
+ if (fd == -1)
+ return NULL;
+ if ((f = fdopen(fd, mode)) == NULL)
+ close(fd);
+ return f;
+
+#ifdef HAVE_MKSTEMP
+ {
+ int file;
+ FILE *fp;
+
+ file = mkstemp(fname);
+ if (file < -1)
+ return NULL;
+ fp = fdopen(file, mode);
+ if (fp == NULL)
+ close(file);
+
+ return fp;
+ }
+#else
mktemp(fname);
return gp_fopentemp(fname, mode);
+#endif
}
/* Open a file with the given name, as a stream of uninterpreted bytes. */

View File

@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Tue Jun 5 16:54:10 2001
+++ src/unix-gcc.mak Wed Sep 12 22:41:20 2001
--- src/unix-gcc.mak.orig Tue Jul 10 12:01:06 2001
+++ src/unix-gcc.mak Sat Nov 3 05:10:14 2001
@@ -27,14 +27,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@ -46,7 +46,23 @@
datadir = $(prefix)/share
gsdir = $(datadir)/ghostscript
gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
@@ -129,7 +130,7 @@
@@ -104,6 +105,15 @@
GENOPT=
+# Choose capability options.
+
+# -DHAVE_MKSTEMP
+# uses mkstemp instead of mktemp
+# This gets rid of several security warnings that look
+# ominous. Enable this if you wish to get rid of them.
+
+CAPOPT= -DHAVE_MKSTEMP
+
# Define the name of the executable file.
GS=gs
@@ -129,7 +139,7 @@
# You may need to change this if the IJG library version changes.
# See jpeg.mak for more information.
@ -55,13 +71,13 @@
JVERSION=6
# Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
@@ -149,14 +150,14 @@
@@ -149,14 +159,14 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
+PSRCDIR=${LOCALBASE}/include
PVERSION=10008
PVERSION=10012
# Choose whether to use a shared version of the PNG library, and if so,
# what its name is.
@ -72,7 +88,7 @@
LIBPNG_NAME=png
# Define the directory where the zlib sources are stored.
@@ -168,7 +169,7 @@
@@ -168,7 +178,7 @@
# what its name is (usually libz, but sometimes libgz).
# See gs.mak and Make.htm for more information.
@ -81,7 +97,7 @@
#ZLIB_NAME=gz
ZLIB_NAME=z
@@ -183,7 +184,7 @@
@@ -183,7 +193,7 @@
# Define the name of the C compiler.
@ -90,7 +106,7 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
@@ -216,9 +217,11 @@
@@ -216,9 +226,11 @@
# We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
@ -104,7 +120,7 @@
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
@@ -227,7 +230,7 @@
@@ -227,7 +239,7 @@
# -R /usr/local/xxx/lib:/usr/local/lib
# giving the full path names of the shared library directories.
# XLDFLAGS can be set from the command line.
@ -113,7 +129,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
@@ -260,7 +263,7 @@
@@ -260,7 +272,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@ -122,7 +138,7 @@
# Define the directory/ies and library names for the X11 library files.
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -272,12 +275,12 @@
@@ -272,12 +284,12 @@
# Solaris and other SVR4 systems with dynamic linking probably want
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need
@ -138,3 +154,12 @@
# Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point.
@@ -406,7 +418,7 @@
# Define the compilation rules and flags.
-CCFLAGS=$(GENOPT) $(CFLAGS)
+CCFLAGS=$(GENOPT) $(CAPOPT) $(CFLAGS)
CC_=$(CC) `cat $(AK)` $(CCFLAGS)
CCAUX=$(CC) `cat $(AK)`
CC_LEAF=$(CC_) -fomit-frame-pointer

View File

@ -37,9 +37,9 @@ libexec/hpijs
%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
share/ghostscript/%%GS_VERSION%%/doc/COPYING
share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
@ -78,14 +78,6 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
share/ghostscript/%%GS_VERSION%%/doc/Use.htm
share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
share/ghostscript/%%GS_VERSION%%/gimp-print/README
share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
share/ghostscript/%%GS_VERSION%%/examples/chess.ps
@ -99,6 +91,14 @@ share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
share/ghostscript/%%GS_VERSION%%/gimp-print/README
share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
share/ghostscript/%%GS_VERSION%%/lib/Fontmap
share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
@ -481,6 +481,7 @@ share/ghostscript/fonts/u004006t.pfm
share/ghostscript/fonts/z003034l.afm
share/ghostscript/fonts/z003034l.pfb
share/ghostscript/fonts/z003034l.pfm
@dirrm share/ghostscript/fonts
@dirrm share/ghostscript/%%GS_VERSION%%/pcl3
@dirrm share/ghostscript/%%GS_VERSION%%/lib
@dirrm share/ghostscript/%%GS_VERSION%%/hpijs
@ -489,7 +490,6 @@ share/ghostscript/fonts/z003034l.pfm
@dirrm share/ghostscript/%%GS_VERSION%%/examples
@dirrm share/ghostscript/%%GS_VERSION%%/doc
@dirrm share/ghostscript/%%GS_VERSION%%
@dirrm share/ghostscript/fonts
@dirrm share/ghostscript
%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj

View File

@ -6,7 +6,7 @@
#
PORTNAME= ghostscript
PORTVERSION= 6.51
PORTVERSION= 6.52
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU} \
${MASTER_SITE_SOURCEFORGE} \
@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
http://www.gelhaus.net/hp880c/1.4beta/ \
http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
http://www.harsch.net/Download/ \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs651/ \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs652/ \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
MASTER_SITE_SUBDIR= ${PORTNAME} gimp-print hpinkjet
PKGNAMESUFFIX= -gnu
@ -86,7 +86,7 @@ HPDJ_MAN1= gs-hpdj.1
# additional driver for HP PCL3 Printers, by Martin Lottermoser
# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
PCL3= pcl3
PCL3_VERS= 3.2
PCL3_VERS= 3.3
PCL3_NAME= ${PCL3}-${PCL3_VERS}
PCL3_SRC= ${PCL3_NAME}.tar.gz
PCL3_MAN1= gs-pcl3.1 pcl3opts.1
@ -165,10 +165,6 @@ post-extract:
post-patch:
${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
${WRKSRC}/src/unix-gcc.mak
find ${WRKSRC}/src -name '*.[ch]' | xargs ${PERL} -pi -e \
's|pputc|stream_putc|g; \
s|pwrite|stream_write|g ; \
s|pputs|stream_puts|g'
# for HPinkjet driver
find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
's|#include <malloc.h>||g; \
@ -184,7 +180,7 @@ pre-configure:
>> ${WRKSRC}/src/contrib.mak
# for PCL3 driver
${ECHO_MSG} ">>> adding ${PCL3} driver to contrib.mak ..."
${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.51.add \
>> ${WRKSRC}/src/contrib.mak
# for gimp-print
${ECHO_MSG} ">>> creating symlinks for ${GPRINT_DESC} ..."
@ -249,7 +245,7 @@ post-install:
${DATADIR}/${PORTVERSION}/hpdj
.endfor
# for PCL3 driver
${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
.for i in ${PCL3_MAN1}
${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
.endfor

View File

@ -1,10 +1,10 @@
MD5 (ghostscript/ghostscript-6.51.tar.bz2) = 6b6d2123daaa1d217aadcbba7f2d6179
MD5 (ghostscript/ghostscript-6.52.tar.bz2) = 5a1b698b8fbece1e23e4d8d9ff552762
MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
MD5 (ghostscript/pcl3-3.2.tar.gz) = c98b9404dfc47d5ff907f9ad81dcbd46
MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
MD5 (ghostscript/print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2
MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8

View File

@ -1,34 +1,60 @@
--- src/gp_unifs.c.orig Tue Jun 5 15:38:58 2001
+++ src/gp_unifs.c Wed Jun 20 04:18:03 2001
@@ -29,6 +29,7 @@
--- src/gp_unifs.c.orig Tue Jun 5 15:31:44 2001
+++ src/gp_unifs.c Sun Jul 15 22:57:50 2001
@@ -28,6 +27,8 @@
#include "gsutil.h" /* for string_match */
#include "stat_.h"
#include "dirent_.h"
+#include "unistd_.h"
+#include <stdlib.h> /* for mkstemp/mktemp */
#include <sys/param.h> /* for MAXPATHLEN */
+#include <unistd.h>
/* Some systems (Interactive for example) don't define MAXPATHLEN,
* so we define it here. (This probably should be done via a Config-Script.)
@@ -59,6 +60,8 @@
@@ -57,22 +58,44 @@
FILE *
gp_open_scratch_file(const char *prefix, char fname[gp_file_name_sizeof],
const char *mode)
{ /* The -8 is for XXXXXX plus a possible final / and -. */
int len = gp_file_name_sizeof - strlen(prefix) - 8;
+ int fd;
+ FILE *f;
if (gp_gettmpdir(fname, &len) != 0)
-{ /* The -8 is for XXXXXX plus a possible final / and -. */
- int len = gp_file_name_sizeof - strlen(prefix) - 8;
-
- if (gp_gettmpdir(fname, &len) != 0)
+{ /* The -8 is for XXXXXX plus a possible final / and -. */
+ int prefix_length = strlen(prefix);
+ int len = gp_file_name_sizeof - prefix_length - 8;
+
+ if (gp_file_name_is_absolute(prefix, prefix_length))
+ *fname = 0;
+ else if (gp_gettmpdir(fname, &len) != 0)
strcpy(fname, "/tmp/");
@@ -71,8 +74,12 @@
else {
if (strlen(fname) != 0 && fname[strlen(fname) - 1] != '/')
strcat(fname, "/");
}
+ if (strlen(fname) + prefix_length + 8 >= gp_file_name_sizeof)
+ return 0; /* file name too long */
strcat(fname, prefix);
/* Prevent trailing X's in path from being converted by mktemp. */
if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
strcat(fname, "-");
strcat(fname, "XXXXXX");
- mktemp(fname);
- return gp_fopentemp(fname, mode);
+ fd = mkstemp(fname);
+ if (fd == -1)
+ return NULL;
+ if ((f = fdopen(fd, mode)) == NULL)
+ close(fd);
+ return f;
+
+#ifdef HAVE_MKSTEMP
+ {
+ int file;
+ FILE *fp;
+
+ file = mkstemp(fname);
+ if (file < -1)
+ return NULL;
+ fp = fdopen(file, mode);
+ if (fp == NULL)
+ close(file);
+
+ return fp;
+ }
+#else
mktemp(fname);
return gp_fopentemp(fname, mode);
+#endif
}
/* Open a file with the given name, as a stream of uninterpreted bytes. */

View File

@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Tue Jun 5 16:54:10 2001
+++ src/unix-gcc.mak Wed Sep 12 22:41:20 2001
--- src/unix-gcc.mak.orig Tue Jul 10 12:01:06 2001
+++ src/unix-gcc.mak Sat Nov 3 05:10:14 2001
@@ -27,14 +27,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@ -46,7 +46,23 @@
datadir = $(prefix)/share
gsdir = $(datadir)/ghostscript
gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
@@ -129,7 +130,7 @@
@@ -104,6 +105,15 @@
GENOPT=
+# Choose capability options.
+
+# -DHAVE_MKSTEMP
+# uses mkstemp instead of mktemp
+# This gets rid of several security warnings that look
+# ominous. Enable this if you wish to get rid of them.
+
+CAPOPT= -DHAVE_MKSTEMP
+
# Define the name of the executable file.
GS=gs
@@ -129,7 +139,7 @@
# You may need to change this if the IJG library version changes.
# See jpeg.mak for more information.
@ -55,13 +71,13 @@
JVERSION=6
# Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
@@ -149,14 +150,14 @@
@@ -149,14 +159,14 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
+PSRCDIR=${LOCALBASE}/include
PVERSION=10008
PVERSION=10012
# Choose whether to use a shared version of the PNG library, and if so,
# what its name is.
@ -72,7 +88,7 @@
LIBPNG_NAME=png
# Define the directory where the zlib sources are stored.
@@ -168,7 +169,7 @@
@@ -168,7 +178,7 @@
# what its name is (usually libz, but sometimes libgz).
# See gs.mak and Make.htm for more information.
@ -81,7 +97,7 @@
#ZLIB_NAME=gz
ZLIB_NAME=z
@@ -183,7 +184,7 @@
@@ -183,7 +193,7 @@
# Define the name of the C compiler.
@ -90,7 +106,7 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
@@ -216,9 +217,11 @@
@@ -216,9 +226,11 @@
# We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
@ -104,7 +120,7 @@
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
@@ -227,7 +230,7 @@
@@ -227,7 +239,7 @@
# -R /usr/local/xxx/lib:/usr/local/lib
# giving the full path names of the shared library directories.
# XLDFLAGS can be set from the command line.
@ -113,7 +129,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
@@ -260,7 +263,7 @@
@@ -260,7 +272,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@ -122,7 +138,7 @@
# Define the directory/ies and library names for the X11 library files.
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -272,12 +275,12 @@
@@ -272,12 +284,12 @@
# Solaris and other SVR4 systems with dynamic linking probably want
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need
@ -138,3 +154,12 @@
# Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point.
@@ -406,7 +418,7 @@
# Define the compilation rules and flags.
-CCFLAGS=$(GENOPT) $(CFLAGS)
+CCFLAGS=$(GENOPT) $(CAPOPT) $(CFLAGS)
CC_=$(CC) `cat $(AK)` $(CCFLAGS)
CCAUX=$(CC) `cat $(AK)`
CC_LEAF=$(CC_) -fomit-frame-pointer

View File

@ -37,9 +37,9 @@ libexec/hpijs
%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
share/ghostscript/%%GS_VERSION%%/doc/COPYING
share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
@ -78,14 +78,6 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
share/ghostscript/%%GS_VERSION%%/doc/Use.htm
share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
share/ghostscript/%%GS_VERSION%%/gimp-print/README
share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
share/ghostscript/%%GS_VERSION%%/examples/cheq.ps
share/ghostscript/%%GS_VERSION%%/examples/chess.ps
@ -99,6 +91,14 @@ share/ghostscript/%%GS_VERSION%%/examples/snowflak.ps
share/ghostscript/%%GS_VERSION%%/examples/tiger.ps
share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps
share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps
share/ghostscript/%%GS_VERSION%%/gimp-print/README
share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj
share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps
share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps
share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html
share/ghostscript/%%GS_VERSION%%/lib/Fontmap
share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
@ -481,6 +481,7 @@ share/ghostscript/fonts/u004006t.pfm
share/ghostscript/fonts/z003034l.afm
share/ghostscript/fonts/z003034l.pfb
share/ghostscript/fonts/z003034l.pfm
@dirrm share/ghostscript/fonts
@dirrm share/ghostscript/%%GS_VERSION%%/pcl3
@dirrm share/ghostscript/%%GS_VERSION%%/lib
@dirrm share/ghostscript/%%GS_VERSION%%/hpijs
@ -489,7 +490,6 @@ share/ghostscript/fonts/z003034l.pfm
@dirrm share/ghostscript/%%GS_VERSION%%/examples
@dirrm share/ghostscript/%%GS_VERSION%%/doc
@dirrm share/ghostscript/%%GS_VERSION%%
@dirrm share/ghostscript/fonts
@dirrm share/ghostscript
%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj