4 files changed, 34 insertions, 46 deletions
diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab
index 0abd2128a5d0..59e59f8282e8 100644
--- a/print/libgnomeprint/files/patch-ab
+++ b/print/libgnomeprint/files/patch-ab
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Mon Jun 10 22:13:33 2002
-+++ Makefile.in	Mon Jun 10 22:14:58 2002
-@@ -105,7 +105,7 @@
- WARN_CFLAGS = @WARN_CFLAGS@
+--- Makefile.in.orig	Tue Feb  4 00:35:09 2003
++++ Makefile.in	Tue Feb  4 00:36:01 2003
+@@ -135,7 +135,7 @@
+ am__quote = @am__quote@
  cxxflags_set = @cxxflags_set@
+ install_sh = @install_sh@
+-SUBDIRS = libgnomeprint tests data po doc
++SUBDIRS = libgnomeprint data po doc
  
--SUBDIRS = libgnomeprint fonts installer tests data po doc
-+SUBDIRS = libgnomeprint fonts installer data po doc
- 
- EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ EXTRA_DIST = \
+     ChangeLog \
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 0dc458067916..540b06885046 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Apr 26 12:49:10 2002
-+++ configure	Fri Apr 26 12:49:40 2002
-@@ -5591,6 +5591,7 @@
+--- configure.orig	Tue Dec 17 16:29:43 2002
++++ configure	Fri Dec 20 16:33:46 2002
+@@ -8161,6 +8161,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,15 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7180,7 +7181,7 @@
-   INSTALL_FONTS_TRUE='#'
-   INSTALL_FONTS_FALSE=
- fi
--FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts
-+FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts
- FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
+@@ -10938,9 +10939,9 @@
+ 
  
+ if test "x${prefix}" = "xNONE"; then
+-	GNOME_PRINT_DATA_DIR='${ac_default_prefix}/${DATADIRNAME}/libgnomeprint/${VERSION}'
++	GNOME_PRINT_DATA_DIR='${ac_default_prefix}/share/gnome/libgnomeprint/${VERSION}'
+ else
+-	GNOME_PRINT_DATA_DIR='${prefix}/${DATADIRNAME}/libgnomeprint/${VERSION}'
++	GNOME_PRINT_DATA_DIR='${prefix}/share/gnome/libgnomeprint/${VERSION}'
+ fi
+ GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR
  
diff --git a/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in
deleted file mode 100644
index 10c52a895c03..000000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- libgnomeprint/drivers/Makefile.in	2002/03/19 16:44:23	1.1
-+++ libgnomeprint/drivers/Makefile.in	2002/03/19 16:48:12
-@@ -118,13 +118,13 @@
- OMNI2_SRC = gnome-print-omni2.cpp gnome-print-omni2.hpp
- OMNI2_LAD = -L$(OMNI_LIBDIR) -lomni
- libgnomeprint_omni2_la_SOURCES = $(OMNI2_SRC)
--libgnomeprint_omni2_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_omni2_la_LDFLAGS = -avoid-version -module
- libgnomeprint_omni2_la_LIBADD = $(OMNI2_LAD)
- 
- FAX_LIB = libgnomeprint-fax.la
- FAX_SRC = gnome-print-fax.c gnome-print-fax.h gnome-print-fax-g3.h
- libgnomeprint_fax_la_SOURCES = $(FAX_SRC)
--libgnomeprint_fax_la_LDFLAGS = -version-info 0:0:0 -module
-+libgnomeprint_fax_la_LDFLAGS = -avoid-version -module
- libgnomeprint_fax_la_LIBADD = 
- 
- libexecdir = $(libdir)/gnome-print-2.0/drivers
diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c
new file mode 100644
index 000000000000..6aa2b9a4fd79
--- /dev/null
+++ b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c
@@ -0,0 +1,12 @@
+--- libgnomeprint/gnome-print.c.orig	Tue Jan  7 14:39:24 2003
++++ libgnomeprint/gnome-print.c	Tue Jan  7 14:39:35 2003
+@@ -38,8 +38,8 @@
+ #include <libgnomeprint/gnome-print-frgba.h>
+ 
+ /* For the buffer stuff, remove when the buffer stuff is moved out here */
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>