aboutsummaryrefslogtreecommitdiffstats
path: root/print
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2001-09-13 01:06:59 +0800
committerknu <knu@FreeBSD.org>2001-09-13 01:06:59 +0800
commit017abb4f662a70592a591420802021772c59604e (patch)
tree22f39286671569db443a7df2da9454e4d3db7b8a /print
parentabfa9b578b7f3590e5c7f0828f4f28a5adaa9f35 (diff)
downloadfreebsd-ports-gnome-017abb4f662a70592a591420802021772c59604e.tar.gz
freebsd-ports-gnome-017abb4f662a70592a591420802021772c59604e.tar.zst
freebsd-ports-gnome-017abb4f662a70592a591420802021772c59604e.zip
Fix a compilation error when A4 is defined.
PR: 30523 Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'print')
-rw-r--r--print/ghostscript-afpl/Makefile2
-rw-r--r--print/ghostscript-afpl/files/patch-src:unix-gcc.mak20
-rw-r--r--print/ghostscript-gpl/Makefile2
-rw-r--r--print/ghostscript-gpl/files/patch-src:unix-gcc.mak20
-rw-r--r--print/ghostscript8/Makefile2
-rw-r--r--print/ghostscript8/files/patch-src:unix-gcc.mak20
6 files changed, 42 insertions, 24 deletions
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 869b77358fb3..ba1c66a8b751 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -50,7 +50,7 @@ MLINKS= gslp.1 gsbj.1 \
ps2ps.1 eps2eps.1
.if defined(A4)
-CFLAGS+= -DA4
+MAKE_ENV+= A4=${A4}
.endif
.if !defined(WITHOUT_X11)
diff --git a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
index 32c9f2b531d5..dbadbe4eb3c1 100644
--- a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Mon Apr 9 14:52:57 2001
-+++ src/unix-gcc.mak Fri Jun 15 21:47:42 2001
++++ src/unix-gcc.mak Wed Sep 12 22:54:27 2001
@@ -26,14 +26,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -83,16 +83,21 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -222,7 +222,7 @@
+@@ -220,9 +220,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.
- XCFLAGS=
+-XCFLAGS=
++ifdef A4
++XCFLAGS=-DA4
++endif
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++CFLAGS+=$(XCFLAGS)
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
-@@ -231,7 +231,7 @@
+@@ -231,7 +233,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.
@@ -101,7 +106,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
-@@ -264,7 +264,7 @@
+@@ -264,7 +266,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@@ -110,7 +115,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
-@@ -277,11 +277,16 @@
+@@ -277,11 +279,16 @@
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need
#XLIBS=Xt SM ICE Xext X11
@@ -128,3 +133,4 @@
+#XLIBS=Xt Xext X11
# Define whether this platform has floating point hardware:
+ # FPU_TYPE=2 means floating point is faster than fixed point.
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 869b77358fb3..ba1c66a8b751 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -50,7 +50,7 @@ MLINKS= gslp.1 gsbj.1 \
ps2ps.1 eps2eps.1
.if defined(A4)
-CFLAGS+= -DA4
+MAKE_ENV+= A4=${A4}
.endif
.if !defined(WITHOUT_X11)
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
index 32c9f2b531d5..dbadbe4eb3c1 100644
--- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Mon Apr 9 14:52:57 2001
-+++ src/unix-gcc.mak Fri Jun 15 21:47:42 2001
++++ src/unix-gcc.mak Wed Sep 12 22:54:27 2001
@@ -26,14 +26,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -83,16 +83,21 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -222,7 +222,7 @@
+@@ -220,9 +220,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.
- XCFLAGS=
+-XCFLAGS=
++ifdef A4
++XCFLAGS=-DA4
++endif
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++CFLAGS+=$(XCFLAGS)
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
-@@ -231,7 +231,7 @@
+@@ -231,7 +233,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.
@@ -101,7 +106,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
-@@ -264,7 +264,7 @@
+@@ -264,7 +266,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@@ -110,7 +115,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
-@@ -277,11 +277,16 @@
+@@ -277,11 +279,16 @@
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need
#XLIBS=Xt SM ICE Xext X11
@@ -128,3 +133,4 @@
+#XLIBS=Xt Xext X11
# Define whether this platform has floating point hardware:
+ # FPU_TYPE=2 means floating point is faster than fixed point.
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 869b77358fb3..ba1c66a8b751 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -50,7 +50,7 @@ MLINKS= gslp.1 gsbj.1 \
ps2ps.1 eps2eps.1
.if defined(A4)
-CFLAGS+= -DA4
+MAKE_ENV+= A4=${A4}
.endif
.if !defined(WITHOUT_X11)
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
index 32c9f2b531d5..dbadbe4eb3c1 100644
--- a/print/ghostscript8/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript8/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Mon Apr 9 14:52:57 2001
-+++ src/unix-gcc.mak Fri Jun 15 21:47:42 2001
++++ src/unix-gcc.mak Wed Sep 12 22:54:27 2001
@@ -26,14 +26,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -83,16 +83,21 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -222,7 +222,7 @@
+@@ -220,9 +220,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.
- XCFLAGS=
+-XCFLAGS=
++ifdef A4
++XCFLAGS=-DA4
++endif
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++CFLAGS+=$(XCFLAGS)
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
-@@ -231,7 +231,7 @@
+@@ -231,7 +233,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.
@@ -101,7 +106,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
-@@ -264,7 +264,7 @@
+@@ -264,7 +266,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@@ -110,7 +115,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
-@@ -277,11 +277,16 @@
+@@ -277,11 +279,16 @@
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
# X11R6 (on any platform) may need
#XLIBS=Xt SM ICE Xext X11
@@ -128,3 +133,4 @@
+#XLIBS=Xt Xext X11
# Define whether this platform has floating point hardware:
+ # FPU_TYPE=2 means floating point is faster than fixed point.