6 files changed, 40 insertions, 43 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index dc58071cbf88..4a96f8ffc7e8 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk11-devel
-# Version required:		1.1.9
+# Version required:		1.1.11
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.37 1998/12/28 13:57:36 vanilla Exp $
+# $Id: Makefile,v 1.38 1998/12/30 23:11:36 vanilla Exp $
 #
 
-DISTNAME=	gtk+-1.1.9
-PKGNAME=	gtk-1.1.9
+DISTNAME=	gtk+-1.1.11
+PKGNAME=	gtk-1.1.11
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index 8e06e730ee13..d1184aa610f3 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
+MD5 (gtk+-1.1.11.tar.gz) = 2a0279653501da12e9645944c1293d39
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 138ef7838fd7..0eb62ad42b92 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,18 +1,18 @@
---- Makefile.in.orig	Thu Dec 17 14:33:47 1998
-+++ Makefile.in	Sun Dec 27 00:28:05 1998
+--- Makefile.in.orig	Thu Dec 31 10:00:04 1998
++++ Makefile.in	Fri Jan  1 01:19:24 1999
 @@ -118,9 +118,9 @@
  xinput_progs = @xinput_progs@
  
  SRC_SUBDIRS = gdk gtk
 -SUBDIRS = po $(SRC_SUBDIRS) docs
-+SUBDIRS = $(SRC_SUBDIRS)
++SUBDIRS = po $(SRC_SUBDIRS)
  
 -bin_SCRIPTS = gtk-config
 +bin_SCRIPTS = gtk11d-config
  
  EXTRA_DIST =	\
  	HACKING		\
-@@ -205,7 +205,7 @@
+@@ -207,7 +207,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
@@ -21,7 +21,7 @@
  SCRIPTS =  $(bin_SCRIPTS)
  
  DATA =  $(m4data_DATA)
-@@ -259,7 +259,10 @@
+@@ -261,7 +261,10 @@
  	-rm -f config.h
  
  maintainer-clean-hdr:
@@ -33,7 +33,7 @@
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
  
  install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -281,25 +284,6 @@
+@@ -283,25 +286,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -59,7 +59,7 @@
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
  # To change the values of `make' variables: instead of editing Makefiles,
-@@ -439,21 +423,19 @@
+@@ -441,21 +425,19 @@
  all-recursive-am: config.h
  	$(MAKE) all-recursive
  
@@ -85,7 +85,7 @@
  	@:
  
  uninstall: uninstall-recursive uninstall-am
-@@ -501,15 +483,15 @@
+@@ -503,15 +485,15 @@
  	-rm -f config.status
  
  .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
@@ -104,8 +104,8 @@
  uninstall-am install-exec install-data install uninstall all \
  installdirs mostlyclean-generic distclean-generic clean-generic \
  maintainer-clean-generic clean mostlyclean distclean maintainer-clean
---- gdk/Makefile.in.orig	Thu Dec 17 14:33:51 1998
-+++ gdk/Makefile.in	Sun Dec 27 00:28:05 1998
+--- gdk/Makefile.in.orig	Thu Dec 31 10:00:08 1998
++++ gdk/Makefile.in	Fri Jan  1 01:19:24 1999
 @@ -119,7 +119,7 @@
  
  gdkincludedir = $(includedir)/gdk
@@ -131,7 +131,7 @@
 -libgdk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +libgdk11d_la_LDFLAGS = \
-+	-version-info 1:1:0 \
++	-version-info 1:2:0 \
           @GLIB_LIBS@	\
           @x_ldflags@	\
           @x_libs@	\
@@ -168,8 +168,8 @@
  
  mostlyclean-binPROGRAMS:
  
---- gtk/Makefile.in.orig	Thu Dec 17 14:33:52 1998
-+++ gtk/Makefile.in	Sun Dec 27 00:28:05 1998
+--- gtk/Makefile.in.orig	Thu Dec 31 10:00:10 1998
++++ gtk/Makefile.in	Fri Jan  1 01:22:40 1999
 @@ -121,7 +121,7 @@
  
  gtkincludedir = $(includedir)/gtk
@@ -177,7 +177,7 @@
 -lib_LTLIBRARIES = libgtk.la
 +lib_LTLIBRARIES = libgtk11d.la
  
- static_sources = \
+ static_SOURCES = \
  	gtkaccelgroup.c		\
 @@ -231,7 +231,7 @@
  	fnmatch.c		\
@@ -185,7 +185,7 @@
  
 -libgtk_la_SOURCES = \
 +libgtk11d_la_SOURCES = \
- 	$(static_sources)	\
+ 	$(static_SOURCES)	\
  	gtkmarshal.c
  
 @@ -368,8 +368,8 @@
@@ -195,7 +195,7 @@
 -libgtk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +libgtk11d_la_LDFLAGS = \
-+	-version-info 1:1:0 \
++	-version-info 1:2:0 \
  	@GLIB_LIBS@ 			\
  	@x_ldflags@			\
  	@x_libs@ 			\
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 5985d8cefdef..9e9bf6651864 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,5 +1,5 @@
---- gtk-config.in.orig	Mon Nov  2 16:41:19 1998
-+++ gtk-config.in	Sun Dec 27 00:28:06 1998
+--- gtk-config.in.orig	Fri Dec 18 10:47:52 1998
++++ gtk-config.in	Fri Jan  1 01:24:08 1999
 @@ -8,7 +8,7 @@
  exec_prefix_set=no
  
@@ -13,8 +13,8 @@
            fi
          fi
        done
--      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm
-+      echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @x_libs@ @GDK_WLIBS@ -lintl -lm
+-      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
        ;;
      *)
        echo "${usage}" 1>&2
diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad
index 4825e812d250..1625a6dfc3bd 100644
--- a/x11-toolkits/gtk12/files/patch-ad
+++ b/x11-toolkits/gtk12/files/patch-ad
@@ -1,17 +1,6 @@
---- gtk/gtkrc.c.orig	Wed Dec 16 09:42:10 1998
-+++ gtk/gtkrc.c	Sun Dec 27 01:04:11 1998
-@@ -26,6 +26,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#ifdef X_LOCALE
-+#include <locale.h>
-+#endif
-+
- #include "gtkrc.h"
- #include "gtkbindings.h"
- #include "gtkthemes.h"
-@@ -228,13 +232,13 @@
+--- gtk/gtkrc.c.orig	Fri Dec 18 10:47:54 1998
++++ gtk/gtkrc.c	Fri Jan  1 02:30:53 1999
+@@ -229,13 +229,13 @@
    var = getenv("GTK_EXE_PREFIX");
    if (var)
      {
@@ -29,7 +18,7 @@
      }
    return path;
  }
-@@ -248,13 +252,13 @@
+@@ -249,13 +249,13 @@
    var = getenv("GTK_DATA_PREFIX");
    if (var)
      {
@@ -47,7 +36,7 @@
      }
    
    for (n = 0; pixmap_path[n]; n++) ;
-@@ -290,13 +294,13 @@
+@@ -291,13 +291,13 @@
    var = getenv("GTK_EXE_PREFIX");
    if (var)
      {
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 8793d6985823..0dde2effd273 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -123,13 +123,21 @@ include/gtk11d/gtk/gtkwindow.h
 lib/libgdk11d.a
 lib/libgdk11d.la
 lib/libgdk11d.so
-lib/libgdk11d.so.1.1
+lib/libgdk11d.so.1.2
 lib/libgtk11d.a
 lib/libgtk11d.la
 lib/libgtk11d.so
-lib/libgtk11d.so.1.1
+lib/libgtk11d.so.1.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/locale/de/LC_MESSAGES/gtk+.mo
+share/locale/fr/LC_MESSAGES/gtk+.mo
+share/locale/ja/LC_MESSAGES/gtk+.mo
+share/locale/nl/LC_MESSAGES/gtk+.mo
+share/locale/no/LC_MESSAGES/gtk+.mo
+share/locale/pl/LC_MESSAGES/gtk+.mo
+share/locale/pt/LC_MESSAGES/gtk+.mo
+share/locale/sv/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default