Update to 2.1.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@244 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 68 insertions, 94 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 2944b114f..a134dc8ea 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.1.2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 762ae4495..58b5a4adc 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-2.1.1.tar.bz2) = ced8d54c1cc3841185c0d4ba492d75d5
+MD5 (gnome2/libgnomeprint-2.1.2.tar.bz2) = dd3d7751fb5740fc2298732a0cfd98c6
diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab
index 70a4f965b..f203016a8 100644
--- a/print/libgnomeprint/files/patch-ab
+++ b/print/libgnomeprint/files/patch-ab
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/print/libgnomeprint/files/patch-ab,v 1.6 2002/06/11 08:15:26 marcus Exp $
-
---- Makefile.in.orig	Mon Jun 10 22:13:33 2002
-+++ Makefile.in	Mon Jun 10 22:14:58 2002
-@@ -105,7 +105,7 @@
+--- Makefile.in.orig	Wed Dec  4 22:51:56 2002
++++ Makefile.in	Wed Dec  4 22:53:28 2002
+@@ -112,7 +112,7 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  cxxflags_set = @cxxflags_set@
  
--SUBDIRS = libgnomeprint fonts installer tests data po doc
-+SUBDIRS = libgnomeprint fonts installer data po doc
+-SUBDIRS = libgnomeprint tests data po doc
++SUBDIRS = libgnomeprint data po doc
  
- EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2
+ EXTRA_DIST = ChangeLog ChangeLog.old ChangeLog.old.2
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 8a13c6344..0afc4f975 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Nov  1 17:24:17 2002
-+++ configure	Sat Nov  9 03:19:14 2002
-@@ -8294,6 +8294,7 @@
+--- configure.orig	Wed Dec  4 13:33:02 2002
++++ configure	Wed Dec  4 23:10:38 2002
+@@ -8160,6 +8160,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10884,7 +10885,7 @@
-   FONTMAPDIR_STATIC=${ac_default_prefix}/share/gnome/libgnomeprint-2.0/fonts
-   FONTMAPDIR_DYNAMIC=${ac_default_prefix}/etc/gnome/libgnomeprint-2.0/fonts
+@@ -10890,7 +10891,7 @@
+ if test "x${prefix}" = "xNONE"; then
+   GNOME_PRINT_DATA_DIR=${ac_default_prefix}/share/${gnome_print_datadir}
  else
--  FONTMAPDIR_STATIC=${datadir}/gnome/libgnomeprint-2.0/fonts
-+  FONTMAPDIR_STATIC=${datadir}/libgnomeprint-2.0/fonts
-   FONTMAPDIR_DYNAMIC=${sysconfdir}/gnome/libgnomeprint-2.0/fonts
+-  GNOME_PRINT_DATA_DIR="${prefix}/share/${gnome_print_datadir}"
++  GNOME_PRINT_DATA_DIR="${prefix}/share/gnome/${gnome_print_datadir}"
  fi
- FONTMAPDIR_STATIC=`eval echo "$FONTMAPDIR_STATIC"`
+ GNOME_PRINT_DATA_DIR=`eval echo "$GNOME_PRINT_DATA_DIR"`
+ cat >>confdefs.h <<_ACEOF
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index b7b237a5b..82862145f 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,4 +1,3 @@
-bin/libgnomeprint-2.0-font-install
 etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
 include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
@@ -20,87 +19,66 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.so
 lib/libgnomeprint-2-2.so.0
-lib/libgnomeprint/2.1.1/modules/drivers/libgnomeprint-fax.so
-lib/libgnomeprint/2.1.1/modules/transports/libgnomeprint-custom.so
-lib/libgnomeprint/2.1.1/modules/transports/libgnomeprint-file.so
-lib/libgnomeprint/2.1.1/modules/transports/libgnomeprint-lpr.so
+lib/libgnomeprint/2.1.2/modules/drivers/libgnomeprint-fax.so
+lib/libgnomeprint/2.1.2/modules/transports/libgnomeprint-custom.so
+lib/libgnomeprint/2.1.2/modules/transports/libgnomeprint-file.so
+lib/libgnomeprint/2.1.2/modules/transports/libgnomeprint-lpr.so
 libdata/pkgconfig/libgnomeprint-2.2.pc
-share/doc/libgnomeprint/index.html
-share/doc/libgnomeprint/index.sgml
-share/doc/libgnomeprint/libgnomeprint-building.html
-share/doc/libgnomeprint/libgnomeprint-compiling.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font.html
-share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
-share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print.html
-share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
-share/doc/libgnomeprint/libgnomeprint-resources.html
-share/doc/libgnomeprint/libgnomeprint.html
-share/doc/libgnomeprint/libgnomeprintunsorted.html
-share/gnome/fonts/README.installer
-share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome/gnome-print-2.0/models/GNOME-PDF-WRITER.model
-share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome/gnome-print-2.0/printers/GENERIC.printer
-share/gnome/gnome-print-2.0/printers/PDF-WRITER.printer
+share/gnome/gnome-print-2.2/models/GNOME-GENERIC-PS.model
+share/gnome/gnome-print-2.2/models/GNOME-PDF-WRITER.model
+share/gnome/gnome-print-2.2/models/HP-LASERJET-4ML.model
+share/gnome/gnome-print-2.2/models/STYLUS-COLOR-740.model
+share/gnome/gnome-print-2.2/printers/GENERIC.printer
+share/gnome/gnome-print-2.2/printers/PDF-WRITER.printer
 share/gnome/gnome-print-2.2/media/media.xml
 share/gnome/gnome-print-2.2/vendors/EPSON.vendor
 share/gnome/gnome-print-2.2/vendors/GNOME.vendor
 share/gnome/gnome-print-2.2/vendors/HP.vendor
-share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
-share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/bg/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ja/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/no/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ro/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@dirrm share/gnome/libgnomeprint-2.0/fonts
-@dirrm share/gnome/libgnomeprint-2.0
+share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm share/gnome/gnome-print-2.2/vendors
 @dirrm share/gnome/gnome-print-2.2/media
+@dirrm share/gnome/gnome-print-2.2/printers
+@dirrm share/gnome/gnome-print-2.2/models
 @dirrm share/gnome/gnome-print-2.2
-@dirrm share/gnome/gnome-print-2.0/printers
-@dirrm share/gnome/gnome-print-2.0/models
-@dirrm share/gnome/gnome-print-2.0
 @dirrm share/doc/libgnomeprint
-@dirrm lib/libgnomeprint/2.1.1/modules/transports
-@dirrm lib/libgnomeprint/2.1.1/modules/drivers
-@dirrm lib/libgnomeprint/2.1.1/modules
-@dirrm lib/libgnomeprint/2.1.1
+@dirrm lib/libgnomeprint/2.1.2/modules/transports
+@dirrm lib/libgnomeprint/2.1.2/modules/drivers
+@dirrm lib/libgnomeprint/2.1.2/modules
+@dirrm lib/libgnomeprint/2.1.2
 @dirrm lib/libgnomeprint
 @dirrm include/libgnomeprint-2.2/libgnomeprint/private
 @dirrm include/libgnomeprint-2.2/libgnomeprint
 @dirrm include/libgnomeprint-2.2
-@dirrm etc/gnome/libgnomeprint-2.0/fonts
-@dirrm etc/gnome/libgnomeprint-2.0