Update to 2.7.1.

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

4 files changed, 103 insertions, 113 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index b3b8aa306..925248ee9 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.7.0
+PORTVERSION=	2.7.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.7
@@ -26,7 +26,8 @@ USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${PORTVERSION} \
+		LIBVERSION=2.2
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 24d0067ac..0ff0700c9 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprint-2.7.0.tar.bz2) = 4f81a870ef3ce4ad785826378e344711
-SIZE (gnome2/libgnomeprint-2.7.0.tar.bz2) = 736981
+MD5 (gnome2/libgnomeprint-2.7.1.tar.bz2) = 60a6e33da00e5b212b1a05a92e131359
+SIZE (gnome2/libgnomeprint-2.7.1.tar.bz2) = 741429
diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print-pdf.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print-pdf.c
deleted file mode 100644
index 185e0b3f4..000000000
--- a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print-pdf.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgnomeprint/gnome-print-pdf.c.orig	Tue Jun 29 22:07:46 2004
-+++ libgnomeprint/gnome-print-pdf.c	Tue Jun 29 22:07:55 2004
-@@ -1224,9 +1224,9 @@
- static void
- gnome_print_embed_all_pdf_fonts (GnomePrintPdf *pdf)
- {
-+	GList *list;
- 	g_return_if_fail (pdf != NULL);
- 
--	GList *list;
- 
- 	list = pdf->fonts;
- 	while (list) {
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 2e50d23a7..f7229c75a 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,43 +1,45 @@
 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
-include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint-2.2/libgnomeprint/gnome-print-pango.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-fontmap.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-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-config.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-key.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-list.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-model.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-node-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-option.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
-include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font-face.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-font.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-glyphlist.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-pango.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-pgl.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-job.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gp-gc.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/libgnomeprint-enum-types.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-font-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-fontmap.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-glyphlist-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-config-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gnome-print-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-config.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-key.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-list.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-model.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-node-private.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-node.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-option.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-printer.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-reference.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-root.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-settings.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-state.h
+include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.so
 lib/libgnomeprint-2-2.so.1
 %%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
+lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
-libdata/pkgconfig/libgnomeprint-2.2.pc
+libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
@@ -68,67 +70,67 @@ share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml
 share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml
-share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo
-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/bn/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/cy/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/el/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/en_GB/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/eu/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/gu/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/is/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/lt/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/mk/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/ml/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/mr/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/pa/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/sq/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/sr@Latn/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/th/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
+share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/be/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/bg/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/bn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ca/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/cs/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/cy/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/da/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/de/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/el/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/es/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/et/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/eu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/fa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/fi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/fr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ga/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/gu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/he/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/hi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/hr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/hu/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/id/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/is/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/it/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ja/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ko/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/lt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/lv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/mk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ml/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/mn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/mr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ms/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/nl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/nn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/no/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pt/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ro/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ru/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sq/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/sv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ta/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/th/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/tr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/uk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/vi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled
@@ -140,8 +142,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm lib/libgnomeprint/%%VERSION%%/modules
 @dirrm lib/libgnomeprint/%%VERSION%%
 @dirrm lib/libgnomeprint
-@dirrm include/libgnomeprint-2.2/libgnomeprint/private
-@dirrm include/libgnomeprint-2.2/libgnomeprint
-@dirrm include/libgnomeprint-2.2
+@dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/private
+@dirrm include/libgnomeprint-%%LIBVERSION%%/libgnomeprint
+@dirrm include/libgnomeprint-%%LIBVERSION%%
 @dirrm etc/gnome/libgnomeprint-2.0/fonts
 @dirrm etc/gnome/libgnomeprint-2.0