summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/gtk2/Makefile5
-rw-r--r--x11/gtk2/PLIST12
-rw-r--r--x11/gtk2/distinfo7
-rw-r--r--x11/gtk2/patches/patch-ad13
4 files changed, 12 insertions, 25 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index f07398fc033..dc38a4c8429 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2004/05/28 18:16:38 reed Exp $
+# $NetBSD: Makefile,v 1.55 2004/06/04 17:55:01 jmmv Exp $
#
-DISTNAME= gtk+-2.4.1
+DISTNAME= gtk+-2.4.2
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.4/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 693ba04b1f8..5d57e2b9e29 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2004/05/02 20:07:37 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.27 2004/06/04 17:55:01 jmmv Exp $
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
bin/gtk-demo
@@ -289,22 +289,22 @@ lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.400
-lib/libgdk-x11-2.0.so.400.1
+lib/libgdk-x11-2.0.so.400.2
lib/libgdk_pixbuf-2.0.a
lib/libgdk_pixbuf-2.0.la
lib/libgdk_pixbuf-2.0.so
lib/libgdk_pixbuf-2.0.so.400
-lib/libgdk_pixbuf-2.0.so.400.1
+lib/libgdk_pixbuf-2.0.so.400.2
lib/libgdk_pixbuf_xlib-2.0.a
lib/libgdk_pixbuf_xlib-2.0.la
lib/libgdk_pixbuf_xlib-2.0.so
lib/libgdk_pixbuf_xlib-2.0.so.400
-lib/libgdk_pixbuf_xlib-2.0.so.400.1
+lib/libgdk_pixbuf_xlib-2.0.so.400.2
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.la
lib/libgtk-x11-2.0.so
lib/libgtk-x11-2.0.so.400
-lib/libgtk-x11-2.0.so.400.1
+lib/libgtk-x11-2.0.so.400.2
lib/pkgconfig/gdk-2.0.pc
lib/pkgconfig/gdk-pixbuf-2.0.pc
lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -918,6 +918,8 @@ ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gtk20.mo
${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/gtk20.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk20.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtk20-properties.mo
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index edd08f91a1d..d3f98ce11b8 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.25 2004/05/19 12:46:10 wiz Exp $
+$NetBSD: distinfo,v 1.26 2004/06/04 17:55:01 jmmv Exp $
-SHA1 (gtk+-2.4.1.tar.bz2) = 608f8b67b0877355b19e49a9daa683909fc65c6b
-Size (gtk+-2.4.1.tar.bz2) = 8853839 bytes
+SHA1 (gtk+-2.4.2.tar.bz2) = b01d890122b5b9061658c41860e9156faf5fca15
+Size (gtk+-2.4.2.tar.bz2) = 9020171 bytes
SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b
SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40
SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
-SHA1 (patch-ad) = 73b4c95639ae911203992f6c9cfca87d2501f1a2
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
deleted file mode 100644
index 2396ce4d1da..00000000000
--- a/x11/gtk2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2004/05/19 12:46:10 wiz Exp $
-
---- gdk-pixbuf/io-pnm.c.orig 2004-01-07 01:26:58.000000000 +0100
-+++ gdk-pixbuf/io-pnm.c
-@@ -237,7 +237,7 @@ pnm_read_next_value (PnmIOBuffer *inbuf,
- *word = '\0';
-
- /* hmmm, there must be more data to this 'word' */
-- if (!g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128))
-+ if (p == inend || (!g_ascii_isspace (*p) && (*p != '#') && (p - inptr < 128)))
- return PNM_SUSPEND;
-
- /* get the value */