3 files changed, 28 insertions, 14 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index f13669b13bc0..41270b8d3016 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,15 +3,15 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/print/libgnomeprint/Makefile,v 1.57 2006/09/10 00:51:12 mezz Exp $
+#   $MCom: ports/print/libgnomeprint/Makefile,v 1.64 2007/03/13 12:57:41 ahze Exp $
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.12.1
-PORTREVISION?=	3
+PORTVERSION=	2.18.0
+PORTREVISION?=	0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -31,7 +31,7 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 1a85a86e0e0d..66f9c02b3aea 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprint-2.12.1.tar.bz2) = ea729d4968fe2169c84efb12ace5f6cc
-SHA256 (gnome2/libgnomeprint-2.12.1.tar.bz2) = f7b8c74faf6eaa145de94791e1d87233ccce5a068de0b8ff5c6fb4c66919295d
-SIZE (gnome2/libgnomeprint-2.12.1.tar.bz2) = 787980
+MD5 (gnome2/libgnomeprint-2.18.0.tar.bz2) = 5bfc42d67cae1148d1faf238185cbf4d
+SHA256 (gnome2/libgnomeprint-2.18.0.tar.bz2) = 2063836aa4d3de6251d3c38350dd41468cf89afde3ed0ae62b7875eb0661cb00
+SIZE (gnome2/libgnomeprint-2.18.0.tar.bz2) = 830629
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 9fef39ee6bca..6b4b5a758bc9 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -39,9 +39,6 @@ lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.la
 lib/libgnomeprint-2-2.so
 lib/libgnomeprint-2-2.so.0
-%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.a
-%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.la
-%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.a
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.la
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-clip.so
@@ -60,6 +57,9 @@ lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-position.so
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.a
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.la
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reorder.so
+lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reverse.a
+lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reverse.la
+lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-reverse.so
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.a
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.la
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-rotate.so
@@ -69,6 +69,9 @@ lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-select.so
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.a
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.la
 lib/libgnomeprint/%%VERSION%%/modules/filters/libgnomeprint-zoom.so
+%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.a
+%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.la
+%%CUPS:%%lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintcups.so
 lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.a
 lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.la
 lib/libgnomeprint/%%VERSION%%/modules/libgnomeprintlpd.so
@@ -95,12 +98,14 @@ 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/bn_IN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/bs/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/dz/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
@@ -121,7 +126,9 @@ 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/ka/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/ko/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/ky/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
@@ -133,7 +140,7 @@ share/locale/nb/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/ne/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/or/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
@@ -156,6 +163,7 @@ share/locale/vi/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/zh_HK/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
@@ -175,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrm etc/gnome/libgnomeprint-2.0
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -197,14 +207,14 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/gl/LC_MESSAGES
@@ -213,9 +223,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be