2 files changed, 76 insertions, 18 deletions

diff --git a/print/ggv2/files/patch-aa b/print/ggv2/files/patch-aa
index 0fdae5a600d8..f844d3ed82d6 100644
--- a/print/ggv2/files/patch-aa
+++ b/print/ggv2/files/patch-aa
@@ -1,20 +1,43 @@
---- configure.orig	Thu Oct 15 04:18:51 1998
-+++ configure	Thu Oct 15 04:19:37 1998
-@@ -925,12 +925,12 @@
+--- configure.orig	Wed Dec 16 23:06:18 1998
++++ configure	Tue Jan 26 14:13:02 1999
+@@ -1076,13 +1076,13 @@
+ 	    fi
+ 	
+ 	    if test "$no_gnome_config" = "yes"; then
+-              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:1081: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-	      if test -f $gnome_prefix/gnomeConf.sh; then
++              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
++echo "configure:1081: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++	      if test -f $prefix/share/gnome/gnomeConf.sh; then
+ 	        echo "$ac_t""found" 1>&6
+ 	        echo "loading gnome configuration from" \
+-		     "$gnome_prefix/gnomeConf.sh"
+-	        . $gnome_prefix/gnomeConf.sh
++		     "$prefix/share/gnome/gnomeConf.sh"
++	        . $prefix/share/gnome/gnomeConf.sh
+ 	        
+ 	      else
+ 	        echo "$ac_t""not found" 1>&6
+@@ -4024,15 +4024,15 @@
+ fi
  
+         
+-	USE_INCLUDED_LIBINTL=yes
++#	USE_INCLUDED_LIBINTL=yes
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
+-	INTLLIBS=$INTLDEPS
+-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+-        nls_cv_header_intl=intl/libintl.h
+-        nls_cv_header_libgt=intl/libgettext.h
++#	INTLDEPS='$(top_builddir)/intl/libintl.a'
++#	INTLLIBS=$INTLDEPS
++#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++#        nls_cv_header_intl=intl/libintl.h
++#        nls_cv_header_libgt=intl/libgettext.h
+       fi
  
- 	if test "$no_gnome_config" = "yes"; then
--          echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:930: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	  if test -f $gnome_prefix/gnomeConf.sh; then
-+          echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:930: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	  if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	    echo "$ac_t""found" 1>&6
--	    echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
--	    . $gnome_prefix/gnomeConf.sh
-+	    echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+	    . $prefix/share/gnome/gnomeConf.sh
- 	    
- 	  else
- 	    echo "$ac_t""not found" 1>&6
+             if test "$XGETTEXT" != ":"; then
diff --git a/print/ggv2/files/patch-ad b/print/ggv2/files/patch-ad
new file mode 100644
index 000000000000..848d6600d88b
--- /dev/null
+++ b/print/ggv2/files/patch-ad
@@ -0,0 +1,35 @@
+--- ps.h.orig	Tue Jan 26 13:58:49 1999
++++ ps.h	Tue Jan 26 13:59:06 1999
+@@ -40,6 +40,7 @@
+ 	/* Constants used to store keywords that are scanned. */
+ 	/* NONE is not a keyword, it tells when a field was not set */
+ 
++#undef NONE
+ enum {ATEND = -1, NONE = 0, PORTRAIT, LANDSCAPE, ASCEND, DESCEND, SPECIAL};
+ 
+ #define PSLINELENGTH 257	/* 255 characters + 1 newline + 1 NULL */
+--- ps.c.orig	Tue Jan 26 14:19:36 1999
++++ ps.c	Tue Jan 26 14:20:12 1999
+@@ -54,7 +54,10 @@
+ #endif
+ #include <ctype.h>
+ #include <X11/Xos.h>		/* #includes the appropriate <string.h> */
++#include <sys/stat.h>
++#include <glib.h>
+ #include "ps.h"
++#include "file.h"
+ 
+ #ifdef BSD4_2
+ #define memset(a,b,c) bzero(a,c)
+@@ -208,11 +211,6 @@
+ /* Jake Hamby patch 18/3/98 */
+ /* Following text added */
+  
+-#include <sys/stat.h>
+-
+-#include <glib.h>
+-
+-#include "file.h"
+ 
+ int
+ file_fileIsNotUseful(fn)