Upgrade to 1.1.3.

4 files changed, 111 insertions, 93 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 736687b2fe5b..853c93e4a1e2 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.1.2
+# Version required:		1.1.3
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.26 1998/09/22 23:31:14 asami Exp $
+# $Id: Makefile,v 1.27 1998/09/23 00:47:16 vanilla Exp $
 #
 
-DISTNAME=	gtk+-1.1.2
-PKGNAME=	gtk-1.1.2
+DISTNAME=	gtk+-1.1.3
+PKGNAME=	gtk-1.1.3
 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 13bf0800541d..5a3afc0e08e7 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.3.tar.gz) = a021cabaf8dec713d35bbd5d4e62681f
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index cf490e3a34c8..92cc1872cb74 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Sep 22 11:47:07 1998
-+++ Makefile.in	Tue Sep 22 22:32:20 1998
+--- Makefile.in.orig	Sat Oct 31 18:05:09 1998
++++ Makefile.in	Mon Nov  2 23:45:35 1998
 @@ -97,7 +97,7 @@
  SRC_SUBDIRS = gdk gtk
  SUBDIRS = $(SRC_SUBDIRS) docs
@@ -48,18 +48,18 @@
  	@:
  
  uninstall: uninstall-recursive uninstall-am
---- docs/Makefile.in.orig	Tue Sep 22 11:47:19 1998
-+++ docs/Makefile.in	Tue Sep 22 22:29:10 1998
+--- docs/Makefile.in.orig	Sat Oct 31 18:05:18 1998
++++ docs/Makefile.in	Mon Nov  2 23:45:35 1998
 @@ -96,7 +96,7 @@
  
- info_TEXINFOS = gdk.texi gtk.texi glib.texi
+ info_TEXINFOS = gdk.texi gtk.texi 
  
 -man_MANS = gtk-config.1
 +man_MANS = gtk11-config.1
  
  EXTRA_DIST =	\
  	texinfo.tex 		\
-@@ -137,7 +137,7 @@
+@@ -237,7 +237,7 @@
  
  TAR = tar
  GZIP = --best
@@ -68,7 +68,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-@@ -163,10 +163,13 @@
+@@ -259,10 +259,13 @@
  
  DVIPS = dvips
  
@@ -83,7 +83,7 @@
  
  .texi.dvi:
  	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-@@ -365,7 +368,7 @@
+@@ -459,7 +462,7 @@
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  mostlyclean:  mostlyclean-aminfo mostlyclean-generic
  
@@ -92,8 +92,75 @@
  
  distclean:  distclean-aminfo distclean-generic clean
  	-rm -f config.status
---- gtk/Makefile.in.orig	Tue Sep 22 11:47:15 1998
-+++ gtk/Makefile.in	Tue Sep 22 22:35:50 1998
+--- gdk/Makefile.in.orig	Sat Oct 31 18:05:12 1998
++++ gdk/Makefile.in	Mon Nov  2 23:46:22 1998
+@@ -96,9 +96,9 @@
+ 
+ gdkincludedir = $(includedir)/gdk
+ 
+-lib_LTLIBRARIES = libgdk.la
++lib_LTLIBRARIES = libgdk11.la
+ 
+-libgdk_la_SOURCES = \
++libgdk11_la_SOURCES = \
+ 	gdk.c		\
+ 	gdkcc.c		\
+ 	gdkcolor.c	\
+@@ -140,8 +140,8 @@
+ 	gdktypes.h	\
+ 	gdkx.h
+ 
+-libgdk_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
++libgdk11_la_LDFLAGS = \
++	-version-info 1:3:0 \
+          @x_ldflags@ @x_libs@
+ 
+ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
+@@ -174,8 +174,8 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libgdk_la_LIBADD = 
+-libgdk_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
++libgdk11_la_LIBADD = 
++libgdk11_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
+ gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkinput.lo \
+ gdkpixmap.lo gdkproperty.lo gdkrgb.lo gdkrectangle.lo gdkregion.lo \
+ gdkselection.lo gdkthreads.lo gdkvisual.lo gdkwindow.lo gdkxid.lo \
+@@ -185,7 +185,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 $@
+@@ -198,8 +198,8 @@
+ 
+ TAR = tar
+ GZIP = --best
+-SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
+-OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
++SOURCES = $(libgdk11_la_SOURCES) $(gxid_SOURCES)
++OBJECTS = $(libgdk11_la_OBJECTS) $(gxid_OBJECTS)
+ 
+ all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+ 
+@@ -276,8 +276,8 @@
+ 
+ maintainer-clean-libtool:
+ 
+-libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
++libgdk11.la: $(libgdk11_la_OBJECTS) $(libgdk11_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libgdk11_la_LDFLAGS) $(libgdk11_la_OBJECTS) $(libgdk11_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-binPROGRAMS:
+ 
+--- gtk/Makefile.in.orig	Sat Oct 31 18:05:14 1998
++++ gtk/Makefile.in	Tue Nov  3 00:08:14 1998
 @@ -98,9 +98,9 @@
  
  gtkincludedir = $(includedir)/gtk
@@ -106,19 +173,19 @@
  	gtkaccelgroup.c		\
  	gtkaccellabel.c		\
  	gtkadjustment.c		\
-@@ -329,8 +329,8 @@
- # special remake rules
- # makeenums.h: @REBUILD@ gtk.h gtkprivate.h
+@@ -331,8 +331,8 @@
+ 	../gdk/gdktypes.h \
+ 	../gdk/gdkrgb.h
  
 -libgtk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 +libgtk11_la_LDFLAGS = \
-+	-version-info 1:0:0
++	-version-info 1:3:0
  
  EXTRA_DIST = \
  	line-arrow.xbm 		\
-@@ -367,12 +367,12 @@
- noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple 
+@@ -371,12 +371,12 @@
+ # FIXME, we currently rely on linking against libglib-1.1
  
  DEPS =	\
 -	libgtk.la					\
@@ -134,7 +201,7 @@
  	@x_ldflags@					\
  	@x_libs@					\
  	@GLIB_LIBS@                                     \
-@@ -405,8 +405,8 @@
+@@ -411,8 +411,8 @@
  X_LIBS = @X_LIBS@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -143,23 +210,32 @@
 +libgtk11_la_LIBADD = 
 +libgtk11_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
  gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
- gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcheckbutton.lo \
- gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo gtkcombo.lo \
-@@ -461,10 +461,10 @@
+ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
+ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \
+@@ -458,7 +458,7 @@
+ simple_SOURCES = simple.c
+ simple_OBJECTS =  simple.o
+ simple_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 $@
+@@ -471,10 +471,10 @@
  
  TAR = tar
  GZIP = --best
--SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c simple.c
--OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o simple.o
-+SOURCES = $(libgtk11_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c simple.c
-+OBJECTS = $(libgtk11_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o simple.o
+-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c
+-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o
++SOURCES = $(libgtk11_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c
++OBJECTS = $(libgtk11_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o
  
 -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all: Makefile $(LTLIBRARIES) $(HEADERS)
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
-@@ -541,8 +541,8 @@
+@@ -551,8 +551,8 @@
  
  maintainer-clean-libtool:
  
@@ -170,61 +246,3 @@
  
  mostlyclean-noinstPROGRAMS:
  
---- gdk/Makefile.in.orig	Tue Sep 22 11:47:10 1998
-+++ gdk/Makefile.in	Tue Sep 22 22:37:27 1998
-@@ -96,9 +96,9 @@
- 
- gdkincludedir = $(includedir)/gdk
- 
--lib_LTLIBRARIES = libgdk.la
-+lib_LTLIBRARIES = libgdk11.la
- 
--libgdk_la_SOURCES = \
-+libgdk11_la_SOURCES = \
- 	gdk.c		\
- 	gdkcc.c		\
- 	gdkcolor.c	\
-@@ -140,8 +140,8 @@
- 	gdktypes.h	\
- 	gdkx.h
- 
--libgdk_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-+libgdk11_la_LDFLAGS = \
-+	-version-info 1:0:0 \
-          @x_ldflags@ @x_libs@
- 
- INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
-@@ -174,8 +174,8 @@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libgdk_la_LIBADD = 
--libgdk_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
-+libgdk11_la_LIBADD = 
-+libgdk11_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
- gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkinput.lo \
- gdkpixmap.lo gdkproperty.lo gdkrgb.lo gdkrectangle.lo gdkregion.lo \
- gdkselection.lo gdkthreads.lo gdkvisual.lo gdkwindow.lo gdkxid.lo \
-@@ -198,8 +198,8 @@
- 
- TAR = tar
- GZIP = --best
--SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
--OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
-+SOURCES = $(libgdk11_la_SOURCES) $(gxid_SOURCES)
-+OBJECTS = $(libgdk11_la_OBJECTS) $(gxid_OBJECTS)
- 
- all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
- 
-@@ -276,8 +276,8 @@
- 
- maintainer-clean-libtool:
- 
--libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
-+libgdk11.la: $(libgdk11_la_OBJECTS) $(libgdk11_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgdk11_la_LDFLAGS) $(libgdk11_la_OBJECTS) $(libgdk11_la_LIBADD) $(LIBS)
- 
- mostlyclean-binPROGRAMS:
- 
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 1634473330f2..206a3ef7642c 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -20,6 +20,7 @@ include/gtk11/gtk/gtkbin.h
 include/gtk11/gtk/gtkbindings.h
 include/gtk11/gtk/gtkbox.h
 include/gtk11/gtk/gtkbutton.h
+include/gtk11/gtk/gtkcalendar.h
 include/gtk11/gtk/gtkcheckbutton.h
 include/gtk11/gtk/gtkcheckmenuitem.h
 include/gtk11/gtk/gtkclist.h
@@ -31,6 +32,7 @@ include/gtk11/gtk/gtkcurve.h
 include/gtk11/gtk/gtkdata.h
 include/gtk11/gtk/gtkdebug.h
 include/gtk11/gtk/gtkdialog.h
+include/gtk11/gtk/gtkdnd.h
 include/gtk11/gtk/gtkdrawingarea.h
 include/gtk11/gtk/gtkeditable.h
 include/gtk11/gtk/gtkentry.h
@@ -53,6 +55,7 @@ include/gtk11/gtk/gtkhscrollbar.h
 include/gtk11/gtk/gtkhseparator.h
 include/gtk11/gtk/gtkimage.h
 include/gtk11/gtk/gtkinputdialog.h
+include/gtk11/gtk/gtkinvisible.h
 include/gtk11/gtk/gtkitem.h
 include/gtk11/gtk/gtkitemfactory.h
 include/gtk11/gtk/gtklabel.h
@@ -112,23 +115,20 @@ include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/glib.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir
 info/gdk.info
-info/glib.info
 info/gtk.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
 lib/libgdk11.a
 lib/libgdk11.la
 lib/libgdk11.so
-lib/libgdk11.so.1
+lib/libgdk11.so.1.3
 lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
-lib/libgtk11.so.1
+lib/libgtk11.so.1.3
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/gtk11/gdk