Downgrage to 1.1.2

Remind by:	asami

4 files changed, 31 insertions, 76 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 853c93e4a1e2..931e59c95cfe 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.3
+# Version required:		1.1.2
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.27 1998/09/23 00:47:16 vanilla Exp $
+# $Id: Makefile,v 1.28 1998/11/02 17:21:20 vanilla Exp $
 #
 
-DISTNAME=	gtk+-1.1.3
-PKGNAME=	gtk-1.1.3
+DISTNAME=	gtk+-1.1.2
+PKGNAME=	gtk-1.1.2
 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 5a3afc0e08e7..13bf0800541d 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.3.tar.gz) = a021cabaf8dec713d35bbd5d4e62681f
+MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 6be5a7fd1cae..ab2df363f765 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Oct 31 18:05:09 1998
-+++ Makefile.in	Tue Nov 10 23:27:32 1998
+--- Makefile.in.orig	Tue Sep 22 11:47:07 1998
++++ Makefile.in	Tue Nov 17 22:36:30 1998
 @@ -97,7 +97,7 @@
  SRC_SUBDIRS = gdk gtk
  SUBDIRS = $(SRC_SUBDIRS) docs
@@ -48,52 +48,8 @@
  	@:
  
  uninstall: uninstall-recursive uninstall-am
---- docs/Makefile.in.orig	Sat Oct 31 18:05:18 1998
-+++ docs/Makefile.in	Tue Nov 10 23:27:32 1998
-@@ -96,7 +96,7 @@
- 
- info_TEXINFOS = gdk.texi gtk.texi 
- 
--man_MANS = gtk-config.1
-+man_MANS = gtk11-config.1
- 
- EXTRA_DIST =	\
- 	texinfo.tex 		\
-@@ -237,7 +237,7 @@
- 
- TAR = tar
- GZIP = --best
--all: Makefile $(INFO_DEPS) $(MANS)
-+all: Makefile clean $(INFO_DEPS) $(MANS)
- 
- .SUFFIXES:
- .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-@@ -259,10 +259,13 @@
- 
- DVIPS = dvips
- 
-+gtk11-config.1:	gtk-config.1
-+	cp gtk-config.1 gtk11-config.1
-+
- .texi.info:
- 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- 	cd $(srcdir) \
--	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
- 
- .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-@@ -459,7 +462,7 @@
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-aminfo mostlyclean-generic
- 
--clean:  clean-aminfo clean-generic mostlyclean
-+clean:  clean-aminfo clean-generic mostlyclean maintainer-clean-aminfo
- 
- distclean:  distclean-aminfo distclean-generic clean
- 	-rm -f config.status
---- gdk/Makefile.in.orig	Sat Oct 31 18:05:12 1998
-+++ gdk/Makefile.in	Tue Nov 10 23:27:47 1998
+--- gdk/Makefile.in.orig	Tue Sep 22 11:47:10 1998
++++ gdk/Makefile.in	Tue Nov 17 22:42:44 1998
 @@ -96,9 +96,9 @@
  
  gdkincludedir = $(includedir)/gdk
@@ -113,7 +69,7 @@
 -libgdk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +libgdk11_la_LDFLAGS = \
-+	-version-info 1:3:0 \
++	-version-info 1:2:0 \
           @x_ldflags@ @x_libs@
  
  INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
@@ -150,8 +106,8 @@
  
  mostlyclean-binPROGRAMS:
  
---- gtk/Makefile.in.orig	Sat Oct 31 18:05:14 1998
-+++ gtk/Makefile.in	Tue Nov 10 23:28:11 1998
+--- gtk/Makefile.in.orig	Tue Sep 22 11:47:15 1998
++++ gtk/Makefile.in	Tue Nov 17 22:43:07 1998
 @@ -98,9 +98,9 @@
  
  gtkincludedir = $(includedir)/gtk
@@ -164,19 +120,19 @@
  	gtkaccelgroup.c		\
  	gtkaccellabel.c		\
  	gtkadjustment.c		\
-@@ -331,8 +331,8 @@
- 	../gdk/gdktypes.h \
- 	../gdk/gdkrgb.h
+@@ -329,8 +329,8 @@
+ # special remake rules
+ # makeenums.h: @REBUILD@ gtk.h gtkprivate.h
  
 -libgtk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 +libgtk11_la_LDFLAGS = \
-+	-version-info 1:3:0
++	-version-info 1:2:0
  
  EXTRA_DIST = \
  	line-arrow.xbm 		\
-@@ -371,12 +371,12 @@
- # FIXME, we currently rely on linking against libglib-1.1
+@@ -367,12 +367,12 @@
+ noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple 
  
  DEPS =	\
 -	libgtk.la					\
@@ -192,7 +148,7 @@
  	@x_ldflags@					\
  	@x_libs@					\
  	@GLIB_LIBS@                                     \
-@@ -411,8 +411,8 @@
+@@ -405,8 +405,8 @@
  X_LIBS = @X_LIBS@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
@@ -201,23 +157,23 @@
 +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 gtkcalendar.lo \
- gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \
-@@ -471,10 +471,10 @@
+ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcheckbutton.lo \
+ gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo gtkcombo.lo \
+@@ -461,10 +461,10 @@
  
  TAR = tar
  GZIP = --best
--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
+-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
  
 -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all: Makefile $(LTLIBRARIES) $(HEADERS)
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
-@@ -551,8 +551,8 @@
+@@ -541,8 +541,8 @@
  
  maintainer-clean-libtool:
  
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 206a3ef7642c..a2e5b964889f 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -20,7 +20,6 @@ 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
@@ -32,7 +31,6 @@ 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
@@ -55,7 +53,6 @@ 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
@@ -114,21 +111,23 @@ include/gtk11/gtk/gtkvscrollbar.h
 include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
+@unexec install-info --delete %D/info/glib.info %D/info/dir
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir
 info/gdk.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/glib.info %D/info/dir
 @exec install-info %D/info/gdk.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.3
+lib/libgdk11.so.1.2
 lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
-lib/libgtk11.so.1.3
+lib/libgtk11.so.1.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/gtk11/gdk