diff options
Diffstat (limited to 'print/ghostscript7/files/patch-src:unix-gcc.mak')
| -rw-r--r-- | print/ghostscript7/files/patch-src:unix-gcc.mak | 94 |
1 files changed, 28 insertions, 66 deletions
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak index 626241a4d32e..2887ad8ef2e5 100644 --- a/print/ghostscript7/files/patch-src:unix-gcc.mak +++ b/print/ghostscript7/files/patch-src:unix-gcc.mak @@ -1,6 +1,6 @@ ---- src/unix-gcc.mak.orig Tue Feb 5 09:20:42 2002 -+++ src/unix-gcc.mak Fri Feb 8 05:16:49 2002 -@@ -27,14 +27,15 @@ +--- src/unix-gcc.mak.orig Sat Apr 20 07:23:09 2002 ++++ src/unix-gcc.mak Sat Apr 27 02:05:12 2002 +@@ -24,14 +24,15 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -24,69 +24,31 @@ # Do not edit the next group of lines. -@@ -53,17 +54,17 @@ +@@ -50,11 +51,10 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. -INSTALL = $(GLSRCDIR)/instcopy -c -INSTALL_PROGRAM = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT) -+INSTALL_DATA = $(BSD_INSTALL_DATA) ++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} ++INSTALL_DATA = ${BSD_INSTALL_DATA} -prefix = /usr/local -+prefix = $(PREFIX) ++prefix = ${PREFIX} exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) - libdir = $(exec_prefix)/lib - mandir = $(prefix)/man - man1ext = 1 -+man1dir = $(mandir)/man$(man1ext) - datadir = $(prefix)/share - gsdir = $(datadir)/ghostscript - gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -@@ -103,14 +104,6 @@ - # No execution time or space penalty. - - 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 - - # Choose capability options. - -@@ -121,7 +114,6 @@ - - CAPOPT= -DHAVE_MKSTEMP - -- - # Define the name of the executable file. - - GS=gs -@@ -147,7 +139,7 @@ - # You may need to change this if the IJG library version changes. - # See jpeg.mak for more information. - --JSRCDIR=jpeg -+JSRCDIR=${.CURDIR}/jpeg - JVERSION=6 - - # Choose whether to use a shared version of the IJG JPEG library (-ljpeg). -@@ -167,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=10012 - - # Choose whether to use a shared version of the PNG library, and if so, +@@ -142,7 +142,7 @@ + # D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read + # some older JPEG streams that violate the standard. If the JPEG + # library built from local sources, the patch will be applied. +-SHARE_JPEG=0 ++SHARE_JPEG=1 + JPEG_NAME=jpeg + + # Define the directory where the PNG library sources are stored, +@@ -157,7 +157,7 @@ # what its name is. # See gs.mak and Make.htm for more information. @@ -95,7 +57,7 @@ LIBPNG_NAME=png # Define the directory where the zlib sources are stored. -@@ -186,7 +178,7 @@ +@@ -169,7 +169,7 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -104,7 +66,7 @@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -197,6 +189,8 @@ +@@ -185,6 +185,8 @@ IJSSRCDIR=ijs IJSEXECTYPE=unix @@ -113,7 +75,7 @@ # Define how to build the library archives. (These are not used in any # standard configuration.) -@@ -208,7 +202,7 @@ +@@ -196,7 +198,7 @@ # Define the name of the C compiler. @@ -122,7 +84,7 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -225,9 +219,9 @@ +@@ -213,9 +215,9 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -135,34 +97,34 @@ CFLAGS_SO=-fPIC # Define the other compilation flags. Add at most one of the following: -@@ -241,7 +235,7 @@ +@@ -229,7 +231,7 @@ # 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. -XCFLAGS= -+XCFLAGS+=-I${.CURDIR}/gimp-print ++XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -252,7 +246,7 @@ +@@ -240,7 +242,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. -XLDFLAGS= +XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib - LDFLAGS=$(XLDFLAGS) -fno-common + LDFLAGS=$(XLDFLAGS) -@@ -285,7 +279,7 @@ +@@ -273,7 +275,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). --XINCLUDE=-I/X11R6/include +-XINCLUDE=-I/usr/X11R6/include +XINCLUDE=-I${X11BASE}/include # 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 -@@ -297,12 +291,12 @@ +@@ -285,12 +287,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 |