Update to 2.1.6.

Submitted by:	Jeremy Messenger <mezz7@cox.net>


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

6 files changed, 16 insertions, 49 deletions

diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 520c49dcd..c26bc2444 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gal2
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.6
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
@@ -20,8 +20,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier intlhack libgnomeui  \
-		libgnomeprintui
+USE_GNOME=	gnomehack gnomeprefix gnomehier lthack intlhack  \
+		libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv
diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo
index 0866d4a80..60db4e806 100644
--- a/x11-toolkits/gal2/distinfo
+++ b/x11-toolkits/gal2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gal-2.1.5.tar.bz2) = 6a6f4d76d3b06c56ca01b8d5a09d9431
-SIZE (gnome2/gal-2.1.5.tar.bz2) = 1022128
+MD5 (gnome2/gal-2.1.6.tar.bz2) = 8121fd66132846d643b13720ade3c05b
+SIZE (gnome2/gal-2.1.6.tar.bz2) = 1073544
diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab
index 1b3b30a64..b246ff6ce 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Dec  8 15:44:58 2003
-+++ Makefile.in	Mon Dec  8 15:45:28 2003
-@@ -139,7 +139,7 @@
- YACC = @YACC@
- gnomelocaledir = @gnomelocaledir@
+--- Makefile.in.orig	Sat Mar  6 00:40:30 2004
++++ Makefile.in	Sat Mar  6 00:40:40 2004
+@@ -136,7 +136,7 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  
 -SUBDIRS = po gal tests docs art
 +SUBDIRS = po gal docs art
  
- pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = gal-2.2.pc
diff --git a/x11-toolkits/gal2/files/patch-configure b/x11-toolkits/gal2/files/patch-configure
deleted file mode 100644
index 97aea5b88..000000000
--- a/x11-toolkits/gal2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Aug 26 00:06:18 2002
-+++ configure	Mon Aug 26 00:06:32 2002
-@@ -8242,6 +8242,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po
index 84357c392..b3072e58b 100644
--- a/x11-toolkits/gal2/files/patch-po_zh_CN.po
+++ b/x11-toolkits/gal2/files/patch-po_zh_CN.po
@@ -1,34 +1,10 @@
---- po/zh_CN.po.orig	Sat Dec 27 21:03:52 2003
-+++ po/zh_CN.po	Sat Dec 27 21:04:17 2003
-@@ -31,32 +31,32 @@
- # gal/e-table/e-cell-date.c:58
- #: gal/e-table/e-cell-date.c:58
- msgid "%l:%M %p"
--msgstr "%-H:%M"
-+msgstr "%H:%M"
- 
- # gal/e-table/e-cell-date.c:66
- #: gal/e-table/e-cell-date.c:66
- msgid "Today %l:%M %p"
--msgstr "今天 %-H:%M"
-+msgstr "今天 %H:%M"
- 
- # gal/e-table/e-cell-date.c:81
- #: gal/e-table/e-cell-date.c:76
- msgid "Yesterday %l:%M %p"
--msgstr "昨天 %-H:%M"
-+msgstr "昨天 %H:%M"
- 
- # gal/e-table/e-cell-date.c:96
- #: gal/e-table/e-cell-date.c:88
- msgid "%a %l:%M %p"
--msgstr "%A %-H:%M"
-+msgstr "%A %H:%M"
- 
+--- po/zh_CN.po.orig	Fri Mar  5 12:17:59 2004
++++ po/zh_CN.po	Sat Mar  6 03:08:34 2004
+@@ -51,12 +51,12 @@
  # gal/e-table/e-cell-date.c:104
  #: gal/e-table/e-cell-date.c:96
  msgid "%b %d %l:%M %p"
--msgstr "%-m月%-d日 %-H:%M"
+-msgstr "%-m月%-d日 %H:%M"
 +msgstr "%m月%d日 %H:%M"
  
  # gal/e-table/e-cell-date.c:106
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 7769a16e2..f5ddc90a0 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -195,6 +195,7 @@ share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gal-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/gal-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gal-%%VERSION%%.mo