Upgrade to 1.0.2,

move /usr/X11R6/share/aclocal/gtk.m4 to /usr/local/share/aclocal/gtk.m4

13 files changed, 74 insertions, 43 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index d06d981de3e2..bc283322d314 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.0.1
+# Version required:		1.0.2
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.15 1998/04/17 13:21:17 erich Exp $
+# $Id: Makefile,v 1.16 1998/05/06 09:46:24 vanilla Exp $
 #
 
-DISTNAME=      gtk+-1.0.1
-PKGNAME=       gtk-1.0.1
+DISTNAME=      gtk+-1.0.2
+PKGNAME=       gtk-1.0.2
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v1.0/
 
@@ -19,6 +19,8 @@ USE_X11=       yes
 
 CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
 
+MAN1=		gtk-config.1
+
 pre-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index ffdfd9a8f110..1dce222addc5 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.0.1.tar.gz) = 199897e300b854bff2e6af5ca4dd575b
+MD5 (gtk+-1.0.2.tar.gz) = c60ea8b94c0704727af79121c3d92abc
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 5e9bfaed5695..cf52bd25f596 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,15 +1,15 @@
---- docs/Makefile.in.orig	Tue Apr 14 11:22:32 1998
-+++ docs/Makefile.in	Fri Apr 24 04:21:27 1998
-@@ -111,7 +111,7 @@
+--- docs/Makefile.in.orig	Sat May 16 13:15:18 1998
++++ docs/Makefile.in	Sun May 17 02:25:40 1998
+@@ -121,7 +121,7 @@
  
  TAR = tar
  GZIP = --best
--all: Makefile $(INFO_DEPS)
-+all: Makefile clean $(INFO_DEPS)
+-all: Makefile $(INFO_DEPS) $(MANS)
++all: Makefile clean $(INFO_DEPS) $(MANS)
  
  .SUFFIXES:
  .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-@@ -140,7 +140,7 @@
+@@ -150,7 +150,7 @@
  .texi.info:
  	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
  	cd $(srcdir) \
@@ -18,7 +18,7 @@
  
  .texi.dvi:
  	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-@@ -300,7 +300,7 @@
+@@ -349,7 +349,7 @@
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  mostlyclean:  mostlyclean-aminfo mostlyclean-generic
  
@@ -83,3 +83,14 @@
  
  libglib_la_LDFLAGS = -version-info 1:0:0
  
+--- Makefile.in.orig	Sun May 17 04:54:59 1998
++++ Makefile.in	Sun May 17 04:56:17 1998
+@@ -149,7 +149,7 @@
+ 	examples/wheelbarrow/wheelbarrow.c  \
+ 	examples/find-examples.sh
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(LOCALBASE)/share/aclocal
+ m4data_DATA = gtk.m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 476cf698275a..18c1be6e8e77 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -33,6 +33,7 @@ include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
+include/gtk/gtkfeatures.h
 include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
@@ -114,17 +115,19 @@ info/gtk.info
 lib/libgdk.a
 lib/libgdk.la
 lib/libgdk.so
-lib/libgdk.so.1.1
+lib/libgdk.so.1.2
 lib/libglib.a
 lib/libglib.la
 lib/libglib.so
-lib/libglib.so.1.1
+lib/libglib.so.1.2
 lib/libgtk.a
 lib/libgtk.la
 lib/libgtk.so
-lib/libgtk.so.1.1
+lib/libgtk.so.1.2
+man/man1/gtk-config.1.gz
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
-share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@cwd /usr/local
+share/aclocal/gtk.m4
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index d06d981de3e2..bc283322d314 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.0.1
+# Version required:		1.0.2
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.15 1998/04/17 13:21:17 erich Exp $
+# $Id: Makefile,v 1.16 1998/05/06 09:46:24 vanilla Exp $
 #
 
-DISTNAME=      gtk+-1.0.1
-PKGNAME=       gtk-1.0.1
+DISTNAME=      gtk+-1.0.2
+PKGNAME=       gtk-1.0.2
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v1.0/
 
@@ -19,6 +19,8 @@ USE_X11=       yes
 
 CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
 
+MAN1=		gtk-config.1
+
 pre-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index ffdfd9a8f110..1dce222addc5 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.0.1.tar.gz) = 199897e300b854bff2e6af5ca4dd575b
+MD5 (gtk+-1.0.2.tar.gz) = c60ea8b94c0704727af79121c3d92abc
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 476cf698275a..18c1be6e8e77 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -33,6 +33,7 @@ include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
+include/gtk/gtkfeatures.h
 include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
@@ -114,17 +115,19 @@ info/gtk.info
 lib/libgdk.a
 lib/libgdk.la
 lib/libgdk.so
-lib/libgdk.so.1.1
+lib/libgdk.so.1.2
 lib/libglib.a
 lib/libglib.la
 lib/libglib.so
-lib/libglib.so.1.1
+lib/libglib.so.1.2
 lib/libgtk.a
 lib/libgtk.la
 lib/libgtk.so
-lib/libgtk.so.1.1
+lib/libgtk.so.1.2
+man/man1/gtk-config.1.gz
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
-share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@cwd /usr/local
+share/aclocal/gtk.m4
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index d06d981de3e2..bc283322d314 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.0.1
+# Version required:		1.0.2
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.15 1998/04/17 13:21:17 erich Exp $
+# $Id: Makefile,v 1.16 1998/05/06 09:46:24 vanilla Exp $
 #
 
-DISTNAME=      gtk+-1.0.1
-PKGNAME=       gtk-1.0.1
+DISTNAME=      gtk+-1.0.2
+PKGNAME=       gtk-1.0.2
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v1.0/
 
@@ -19,6 +19,8 @@ USE_X11=       yes
 
 CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
 
+MAN1=		gtk-config.1
+
 pre-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index ffdfd9a8f110..1dce222addc5 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.0.1.tar.gz) = 199897e300b854bff2e6af5ca4dd575b
+MD5 (gtk+-1.0.2.tar.gz) = c60ea8b94c0704727af79121c3d92abc
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 476cf698275a..18c1be6e8e77 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -33,6 +33,7 @@ include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
+include/gtk/gtkfeatures.h
 include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
@@ -114,17 +115,19 @@ info/gtk.info
 lib/libgdk.a
 lib/libgdk.la
 lib/libgdk.so
-lib/libgdk.so.1.1
+lib/libgdk.so.1.2
 lib/libglib.a
 lib/libglib.la
 lib/libglib.so
-lib/libglib.so.1.1
+lib/libglib.so.1.2
 lib/libgtk.a
 lib/libgtk.la
 lib/libgtk.so
-lib/libgtk.so.1.1
+lib/libgtk.so.1.2
+man/man1/gtk-config.1.gz
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
-share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@cwd /usr/local
+share/aclocal/gtk.m4
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index d06d981de3e2..bc283322d314 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.0.1
+# Version required:		1.0.2
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.15 1998/04/17 13:21:17 erich Exp $
+# $Id: Makefile,v 1.16 1998/05/06 09:46:24 vanilla Exp $
 #
 
-DISTNAME=      gtk+-1.0.1
-PKGNAME=       gtk-1.0.1
+DISTNAME=      gtk+-1.0.2
+PKGNAME=       gtk-1.0.2
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v1.0/
 
@@ -19,6 +19,8 @@ USE_X11=       yes
 
 CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
 
+MAN1=		gtk-config.1
+
 pre-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index ffdfd9a8f110..1dce222addc5 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.0.1.tar.gz) = 199897e300b854bff2e6af5ca4dd575b
+MD5 (gtk+-1.0.2.tar.gz) = c60ea8b94c0704727af79121c3d92abc
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 476cf698275a..18c1be6e8e77 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -33,6 +33,7 @@ include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
+include/gtk/gtkfeatures.h
 include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
@@ -114,17 +115,19 @@ info/gtk.info
 lib/libgdk.a
 lib/libgdk.la
 lib/libgdk.so
-lib/libgdk.so.1.1
+lib/libgdk.so.1.2
 lib/libglib.a
 lib/libglib.la
 lib/libglib.so
-lib/libglib.so.1.1
+lib/libglib.so.1.2
 lib/libgtk.a
 lib/libgtk.la
 lib/libgtk.so
-lib/libgtk.so.1.1
+lib/libgtk.so.1.2
+man/man1/gtk-config.1.gz
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
-share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@cwd /usr/local
+share/aclocal/gtk.m4