Fix a compilation error when A4 is defined.

PR:		30522
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 26 insertions, 16 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index b4d931a8188f..04b31bdc190b 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -47,7 +47,7 @@ MLINKS=		gslp.1 gsbj.1 \
 		ps2pdf.1 ps2pdf13.1
 
 .if defined(A4)
-CFLAGS+=	-DA4
+MAKE_ENV=	A4="${A4}"
 .endif
 
 .if !defined(WITHOUT_X11)
diff --git a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
index c0082fdd6ecd..6780bad5bf08 100644
--- a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
 --- src/unix-gcc.mak.orig	Tue Jun  5 16:54:10 2001
-+++ src/unix-gcc.mak	Fri Jun 15 04:11:50 2001
++++ src/unix-gcc.mak	Wed Sep 12 22:41:20 2001
 @@ -27,14 +27,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -90,16 +90,21 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -218,7 +219,7 @@
+@@ -216,9 +217,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.
-@@ -227,7 +228,7 @@
+@@ -227,7 +230,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.
@@ -108,7 +113,7 @@
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -260,7 +261,7 @@
+@@ -260,7 +263,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -117,7 +122,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 +273,12 @@
+@@ -272,12 +275,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
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index b4d931a8188f..04b31bdc190b 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -47,7 +47,7 @@ MLINKS=		gslp.1 gsbj.1 \
 		ps2pdf.1 ps2pdf13.1
 
 .if defined(A4)
-CFLAGS+=	-DA4
+MAKE_ENV=	A4="${A4}"
 .endif
 
 .if !defined(WITHOUT_X11)
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
index c0082fdd6ecd..6780bad5bf08 100644
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
 --- src/unix-gcc.mak.orig	Tue Jun  5 16:54:10 2001
-+++ src/unix-gcc.mak	Fri Jun 15 04:11:50 2001
++++ src/unix-gcc.mak	Wed Sep 12 22:41:20 2001
 @@ -27,14 +27,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -90,16 +90,21 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -218,7 +219,7 @@
+@@ -216,9 +217,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.
-@@ -227,7 +228,7 @@
+@@ -227,7 +230,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.
@@ -108,7 +113,7 @@
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -260,7 +261,7 @@
+@@ -260,7 +263,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -117,7 +122,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 +273,12 @@
+@@ -272,12 +275,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