Upgrade, 970925 -> 971025.

Submitted by:	maintainer
PR:		4869

13 files changed, 36 insertions, 46 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 85841a6d83a8..5b1388966bb2 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:    970925
+# Version required:    971025
 # Date Created:                28 Sep 1997
 # Whom:                        Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/10/15 16:07:01 erich Exp $
 #
 
-DISTNAME=      gtk+970925
-PKGNAME=       gtk-970925
+DISTNAME=      gtk+971025
+PKGNAME=       gtk-971025
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/
 
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index c97131593ea6..929e714d16c4 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+970925.tar.gz) = 0bbb0f2fc262a529f59c0ea3a496afac
+MD5 (gtk+971025.tar.gz) = 1fc37150549062622866600b4a78aaa5
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 239da556afa2..db5957d27ba2 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -8,28 +8,6 @@
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
  echo "configure:566: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
---- ./gdk/Makefile.in.orig	Sun Oct 12 15:48:17 1997
-+++ ./gdk/Makefile.in	Sun Oct 12 15:47:48 1997
-@@ -153,7 +153,7 @@
- gxid_OBJECTS =  gxid.o
- gxid_DEPENDENCIES = 
- gxid_LDFLAGS = 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DX_LOCALE
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
---- ./gdk/gdk.c.orig	Sun Oct 12 15:49:46 1997
-+++ ./gdk/gdk.c	Sun Oct 12 15:49:54 1997
-@@ -18,7 +18,7 @@
- #include "../config.h"
- 
- #include <ctype.h>
--#include <locale.h>
-+#include <X11/Xlocale.h>
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
 --- ./docs/Makefile.in.orig	Sun Oct 12 15:50:23 1997
 +++ ./docs/Makefile.in	Sun Oct 12 15:50:50 1997
 @@ -116,7 +116,7 @@
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 5601a59366a6..07aacaed56a2 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,10 +1,12 @@
-lib/libglib.so.1.0
 lib/libglib.la
+lib/libglib.so.1.0
+lib/libglib.so
 lib/libglib.a
 include/glib.h
 include/glibconfig.h
 lib/libgdk.la
 lib/libgdk.so.1.0
+lib/libgdk.so
 lib/libgdk.a
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
@@ -21,6 +23,7 @@ include/gdk/gxid_proto.h
 include/gdk/gdkx.h
 lib/libgtk.la
 lib/libgtk.so.1.0
+lib/libgtk.so
 lib/libgtk.a
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 85841a6d83a8..5b1388966bb2 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:    970925
+# Version required:    971025
 # Date Created:                28 Sep 1997
 # Whom:                        Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/10/15 16:07:01 erich Exp $
 #
 
-DISTNAME=      gtk+970925
-PKGNAME=       gtk-970925
+DISTNAME=      gtk+971025
+PKGNAME=       gtk-971025
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/
 
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index c97131593ea6..929e714d16c4 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+970925.tar.gz) = 0bbb0f2fc262a529f59c0ea3a496afac
+MD5 (gtk+971025.tar.gz) = 1fc37150549062622866600b4a78aaa5
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 5601a59366a6..07aacaed56a2 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,10 +1,12 @@
-lib/libglib.so.1.0
 lib/libglib.la
+lib/libglib.so.1.0
+lib/libglib.so
 lib/libglib.a
 include/glib.h
 include/glibconfig.h
 lib/libgdk.la
 lib/libgdk.so.1.0
+lib/libgdk.so
 lib/libgdk.a
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
@@ -21,6 +23,7 @@ include/gdk/gxid_proto.h
 include/gdk/gdkx.h
 lib/libgtk.la
 lib/libgtk.so.1.0
+lib/libgtk.so
 lib/libgtk.a
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 85841a6d83a8..5b1388966bb2 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:    970925
+# Version required:    971025
 # Date Created:                28 Sep 1997
 # Whom:                        Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/10/15 16:07:01 erich Exp $
 #
 
-DISTNAME=      gtk+970925
-PKGNAME=       gtk-970925
+DISTNAME=      gtk+971025
+PKGNAME=       gtk-971025
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/
 
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index c97131593ea6..929e714d16c4 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+970925.tar.gz) = 0bbb0f2fc262a529f59c0ea3a496afac
+MD5 (gtk+971025.tar.gz) = 1fc37150549062622866600b4a78aaa5
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 5601a59366a6..07aacaed56a2 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,10 +1,12 @@
-lib/libglib.so.1.0
 lib/libglib.la
+lib/libglib.so.1.0
+lib/libglib.so
 lib/libglib.a
 include/glib.h
 include/glibconfig.h
 lib/libgdk.la
 lib/libgdk.so.1.0
+lib/libgdk.so
 lib/libgdk.a
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
@@ -21,6 +23,7 @@ include/gdk/gxid_proto.h
 include/gdk/gdkx.h
 lib/libgtk.la
 lib/libgtk.so.1.0
+lib/libgtk.so
 lib/libgtk.a
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 85841a6d83a8..5b1388966bb2 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:    970925
+# Version required:    971025
 # Date Created:                28 Sep 1997
 # Whom:                        Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/10/15 16:07:01 erich Exp $
 #
 
-DISTNAME=      gtk+970925
-PKGNAME=       gtk-970925
+DISTNAME=      gtk+971025
+PKGNAME=       gtk-971025
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/
 
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index c97131593ea6..929e714d16c4 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+970925.tar.gz) = 0bbb0f2fc262a529f59c0ea3a496afac
+MD5 (gtk+971025.tar.gz) = 1fc37150549062622866600b4a78aaa5
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 5601a59366a6..07aacaed56a2 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,10 +1,12 @@
-lib/libglib.so.1.0
 lib/libglib.la
+lib/libglib.so.1.0
+lib/libglib.so
 lib/libglib.a
 include/glib.h
 include/glibconfig.h
 lib/libgdk.la
 lib/libgdk.so.1.0
+lib/libgdk.so
 lib/libgdk.a
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
@@ -21,6 +23,7 @@ include/gdk/gxid_proto.h
 include/gdk/gdkx.h
 lib/libgtk.la
 lib/libgtk.so.1.0
+lib/libgtk.so
 lib/libgtk.a
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h