Make this build and then install under Linux. The generated Makefile

had some problems in the developer's own "My personal settings" section
which was for Linux only. I made it work and then noticed that the
app-defaults was now wrong and so it would not package.
So I commented out the entire "My personal settings" section.
This won't change for other operating system builds because
it was "LinuxArchitecture" only.

I didn't bump PKGREVISION because this didn't build (as far
as I can tell) in the first place under Linux and didn't package
under Linux either.

I tested under NetBSD 1.6.2_STABLE also.

2 files changed, 28 insertions, 8 deletions

diff --git a/print/gv/distinfo b/print/gv/distinfo
index 0061d3e49fb..48d254a5e53 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2003/11/10 02:45:01 danw Exp $
+$NetBSD: distinfo,v 1.7 2004/07/24 00:06:23 reed Exp $
 
 SHA1 (gv-3.5.8.tar.gz) = 5c67b41ee19887bf1efed4e958d09d3845a857aa
 Size (gv-3.5.8.tar.gz) = 369609 bytes
-SHA1 (patch-aa) = a1a3a3006d9e8a3b98da6110afd0ac9962bf6d3d
+SHA1 (patch-aa) = 9896cda759cf9d722030345fbaee0b757e73257f
 SHA1 (patch-ab) = 219c5b4b9402dd68dc4855eb8179f44d60e9d8af
 SHA1 (patch-ac) = 19c9eb3db6b670f41996a7e5d10aaca1b1f92835
 SHA1 (patch-ae) = c9ff70c144a793b3cb058aa039dd51e8991d8036
diff --git a/print/gv/patches/patch-aa b/print/gv/patches/patch-aa
index a5bdee3c40d..e2d636c8dff 100644
--- a/print/gv/patches/patch-aa
+++ b/print/gv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2003/11/10 02:45:01 danw Exp $
+$NetBSD: patch-aa,v 1.9 2004/07/24 00:06:23 reed Exp $
 
---- config.Unix.orig	Fri Jun  6 18:00:00 1997
-+++ config.Unix	Sun Mar 30 21:25:38 2003
-@@ -32,16 +32,17 @@
+--- config.Unix.orig	Fri Jun  6 15:00:00 1997
++++ config.Unix
+@@ -32,16 +32,17 @@ XCOMM ##################################
  XCOMM --------------------------------------------------------------------
  XCOMM  Destination directories.
  XCOMM --------------------------------------------------------------------
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.8 2003/11/10 02:45:01 danw Exp $
  
  XCOMM --------------------------------------------------------------------
  XCOMM  As far as the Xaw3d header files are concerned it is by
-@@ -110,7 +111,7 @@
+@@ -110,7 +111,7 @@ XCOMM ----------------------------------
  XCOMM --------------------------------------------------------------------
  XCOMM --- Use extra code for setenv() and getenv() ?
  XCOMM --------------------------------------------------------------------
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.8 2003/11/10 02:45:01 danw Exp $
  #   define USE_SETENV_CODE
  #endif
  
-@@ -206,6 +207,7 @@
+@@ -206,6 +207,7 @@ XCOMM ----------------------------------
  XCOMM  Destination directory for the gv class resource file.
  XCOMM --------------------------------------------------------------------
  XCOMM XAPPLOADDIR	= /home/etc/class-defaults
@@ -42,3 +42,23 @@ $NetBSD: patch-aa,v 1.8 2003/11/10 02:45:01 danw Exp $
  
  XCOMM ####################################################################
  XCOMM ##### Don't touch any of the settings below ... 
+@@ -244,12 +246,12 @@ XCOMM ----------------------------------
+ XCOMM  My personal settings ...
+ XCOMM --------------------------------------------------------------------
+ 
+-#ifdef LinuxArchitecture
+-   ifdef GV_DEVELOPMENT_OPTIONS
+-         XAPPLOADDIR  = /home/etc/class-defaults
+-         CCOPTIONS    = -ansi -pedantic -Wall -Wmissing-declarations
+-XCOMM     -Wredundant-decls -Wmissing-prototypes -Wconversion -Wstrict-prototypes
+-   endif
+-#endif
++XCOMM #ifdef LinuxArchitecture
++XCOMM   ifdef GV_DEVELOPMENT_OPTIONS
++XCOMM         XAPPLOADDIR  = /home/etc/class-defaults
++XCOMM         CCOPTIONS    = -ansi -pedantic -Wall -Wmissing-declarations
++XCOMM XCOMM     -Wredundant-decls -Wmissing-prototypes -Wconversion -Wstrict-prototypes
++XCOMM   endif
++XCOMM #endif
+ 
+