Update to 2.1.1.

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

4 files changed, 59 insertions, 59 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 8b7dd9b65..1f6b67f04 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	1.116.1
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.116
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	bonobo-2.0:${PORTSDIR}/devel/libbonobo \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
-		gtk-x11-2.0.101:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.102:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 11d580f1a..762ae4495 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.116.1.tar.bz2) = de58f804997e1bb39b06661e4fb2dcd2
+MD5 (gnome2/libgnomeprint-2.1.1.tar.bz2) = ced8d54c1cc3841185c0d4ba492d75d5
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 1add6e710..8a13c6344 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/print/libgnomeprint/files/patch-configure,v 1.5 2002/04/26 10:00:58 sobomax Exp $
-
---- configure.orig	Fri Apr 26 12:49:10 2002
-+++ configure	Fri Apr 26 12:49:40 2002
-@@ -5591,6 +5591,7 @@
+--- configure.orig	Fri Nov  1 17:24:17 2002
++++ configure	Sat Nov  9 03:19:14 2002
+@@ -8294,6 +8294,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD: ports/print/libgnomeprint/files/patch-configure,v 1.5 2002/04/26 10:00
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7180,7 +7181,7 @@
-   INSTALL_FONTS_TRUE='#'
-   INSTALL_FONTS_FALSE=
+@@ -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
+ else
+-  FONTMAPDIR_STATIC=${datadir}/gnome/libgnomeprint-2.0/fonts
++  FONTMAPDIR_STATIC=${datadir}/libgnomeprint-2.0/fonts
+   FONTMAPDIR_DYNAMIC=${sysconfdir}/gnome/libgnomeprint-2.0/fonts
  fi
--FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts
-+FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts
- FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
- 
- 
+ FONTMAPDIR_STATIC=`eval echo "$FONTMAPDIR_STATIC"`
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 56b28ca46..b7b237a5b 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,28 +1,30 @@
 bin/libgnomeprint-2.0-font-install
 etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
-include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
-include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
-include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
-lib/gnome-print-2.0/transports/libgnomeprint-custom.so
-lib/gnome-print-2.0/transports/libgnomeprint-file.so
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
-lib/libgnomeprint-2.a
-lib/libgnomeprint-2.so
-lib/libgnomeprint-2.so.0
-libdata/pkgconfig/libgnomeprint-2.0.pc
+include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-2.2/libgnomeprint/gp-gc.h
+include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h
+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
+libdata/pkgconfig/libgnomeprint-2.2.pc
 share/doc/libgnomeprint/index.html
 share/doc/libgnomeprint/index.sgml
 share/doc/libgnomeprint/libgnomeprint-building.html
@@ -37,36 +39,33 @@ 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-question-index.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/media/media.xml
 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/vendors/EPSON.vendor
-share/gnome/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome/gnome-print-2.0/vendors/HP.vendor
+share/gnome/gnome-print-2.0/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/ar/LC_MESSAGES/libgnomeprint-2.0.mo
 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/cs/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/he/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/lv/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
@@ -88,15 +87,20 @@ 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
-@dirrm share/gnome/gnome-print-2.0/vendors
+@dirrm share/gnome/gnome-print-2.2/vendors
+@dirrm share/gnome/gnome-print-2.2/media
+@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/media
 @dirrm share/gnome/gnome-print-2.0
 @dirrm share/doc/libgnomeprint
-@dirrm lib/gnome-print-2.0/transports
-@dirrm lib/gnome-print-2.0/drivers
-@dirrm lib/gnome-print-2.0
-@dirrm include/libgnomeprint-2.0/libgnomeprint/private
-@dirrm include/libgnomeprint-2.0/libgnomeprint
-@dirrm include/libgnomeprint-2.0
+@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
+@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