Sync w/ FreeBSD ports.

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

3 files changed, 25 insertions, 21 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 76a630122..9e1c554cb 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/print/libgnomeprint/Makefile,v 1.67 2007/05/19 21:36:20 marcus Exp $
+#   $MCom$
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.18.0
-PORTREVISION?=	4
+PORTVERSION=	2.18.1
+PORTREVISION?=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -61,8 +61,6 @@ post-patch:
 		's|<malloc[.]h>|<stdlib.h>|'
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s|tests||" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s|doc||" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|UTF8|UTF-8|g' \
-		${WRKSRC}/libgnomeprint/modules/cups/gnome-print-cups.c
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 66f9c02b3..52b40c8b4 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnomeprint-2.18.1.tar.bz2) = be87a17490c4976a85488537f22bcfde
+SHA256 (gnome2/libgnomeprint-2.18.1.tar.bz2) = a64ce84b67552c32bd6cc322dbad2056ca9bdc43d825eb126109841adb67d18b
+SIZE (gnome2/libgnomeprint-2.18.1.tar.bz2) = 870168
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 5191a6e65..296d23cfd 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -85,13 +85,13 @@ lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.a
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.la
 lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so
 libdata/pkgconfig/libgnomeprint-%%LIBVERSION%%.pc
-share/libgnomeprint/%%VERSION%%/globals.xml
-share/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml
-share/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml
-share/libgnomeprint/%%VERSION%%/models/uninstalled/GNOME-META.xml
-share/libgnomeprint/%%VERSION%%/printers/GENERIC.xml
-share/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml
-share/libgnomeprint/%%VERSION%%/printers/uninstalled/META.xml
+%%DATADIR%%/%%VERSION%%/globals.xml
+%%DATADIR%%/%%VERSION%%/models/GNOME-GENERIC-PS.xml
+%%DATADIR%%/%%VERSION%%/models/GNOME-PDF-WRITER.xml
+%%DATADIR%%/%%VERSION%%/models/uninstalled/GNOME-META.xml
+%%DATADIR%%/%%VERSION%%/printers/GENERIC.xml
+%%DATADIR%%/%%VERSION%%/printers/PDF-WRITER.xml
+%%DATADIR%%/%%VERSION%%/printers/uninstalled/META.xml
 share/locale/am/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/ar/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/az/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@@ -140,6 +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/oc/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
@@ -148,6 +149,7 @@ 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/rw/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
+share/locale/si/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
@@ -165,12 +167,12 @@ 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/libgnomeprint/%%VERSION%%/printers/uninstalled
-@dirrm share/libgnomeprint/%%VERSION%%/printers
-@dirrm share/libgnomeprint/%%VERSION%%/models/uninstalled
-@dirrm share/libgnomeprint/%%VERSION%%/models
-@dirrm share/libgnomeprint/%%VERSION%%
-@dirrm share/libgnomeprint
+@dirrm %%DATADIR%%/%%VERSION%%/printers/uninstalled
+@dirrm %%DATADIR%%/%%VERSION%%/printers
+@dirrm %%DATADIR%%/%%VERSION%%/models/uninstalled
+@dirrm %%DATADIR%%/%%VERSION%%/models
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm lib/libgnomeprint/%%VERSION%%/modules/transports
 @dirrm lib/libgnomeprint/%%VERSION%%/modules/filters
 @dirrm lib/libgnomeprint/%%VERSION%%/modules
@@ -187,8 +189,12 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/ky/LC_MESSAGES