upgrade to 0.99.7

13 files changed, 171 insertions, 159 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 286d930f4678..99e432493753 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -3,11 +3,12 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.10 1998/03/09 02:52:55 steve Exp $
+# $Id: Makefile,v 1.11 1998/03/14 19:47:58 vanilla Exp $
 #
 
-DISTNAME=      gtk+-0.99.5
-PKGNAME=       gtk-0.99.5
+DISTNAME=      gtk+-0.99.7
+PKGNAME=       gtk-0.99.7
+
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v0.99/
 
@@ -17,6 +18,8 @@ GNU_CONFIGURE= yes
 USE_GMAKE=     yes
 USE_X11=       yes
 
+CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
+
 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 3349499600ae..055db5e72e36 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-0.99.5.tar.gz) = f02e8c01112632855b3fa57b4d18ff51
+MD5 (gtk+-0.99.7.tar.gz) = 33ec3b0611f7a1f7b12f44f27ccc5328
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 6cbd584d1638..49fd776502e1 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,16 +1,6 @@
---- glib/configure.orig	Sun Dec  7 05:45:40 1997
-+++ glib/configure	Tue Dec  9 16:00:29 1997
-@@ -561,6 +561,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
-+INSTALL="/usr/bin/install -c"
- 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
---- docs/Makefile.in.orig	Sun Dec  7 06:12:07 1997
-+++ docs/Makefile.in	Tue Dec  9 16:00:29 1997
-@@ -117,7 +117,7 @@
+--- docs/Makefile.in~	Tue Mar 17 08:06:42 1998
++++ docs/Makefile.in	Tue Mar 17 08:07:00 1998
+@@ -137,7 +137,7 @@
  .texi.info:
  	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
  	cd $(srcdir) \
@@ -19,13 +9,3 @@
  
  .texi.dvi:
  	TEXINPUTS=$(srcdir):$$TEXINPUTS \
---- configure.orig	Sun Jan  4 01:16:42 1998
-+++ configure	Mon Jan  5 23:09:23 1998
-@@ -590,6 +590,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
-+INSTALL="/usr/bin/install -c"
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:595: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 9addf93b9eea..24f7077c1dae 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,3 +1,25 @@
+info/dir
+info/gdk.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+info/glib.info
+bin/gtk-config
+share/aclocal/gtk.m4
+lib/libglib.so.1.0
+lib/libglib.la
+lib/libglib.a
+lib/glib/include/glibconfig.h
+lib/libgdk.so.1.0
+lib/libgdk.la
+lib/libgdk.a
+lib/libgtk.so.1.0
+lib/libgtk.la
+lib/libgtk.a
+include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -5,16 +27,14 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
-include/glib.h
-include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkaspectframe.h
-include/gtk/gtkbbox.h
 include/gtk/gtkbin.h
+include/gtk/gtkbbox.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -28,6 +48,7 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
+include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -36,7 +57,6 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
-include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -52,6 +72,7 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
+include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -69,17 +90,16 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
-include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
+include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstatusbar.h
 include/gtk/gtkstyle.h
+include/gtk/gtkstatusbar.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -88,7 +108,6 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
-include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -100,26 +119,12 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/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/libgdk.a
-lib/libgdk.la
-lib/libgdk.so.1.0
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so.1.0
-lib/libgtk.a
-lib/libgtk.la
-lib/libgtk.so.1.0
-@unexec /sbin/ldconfig -R
-@exec /sbin/ldconfig -m %D/lib
+include/gtk/gtktypebuiltins.h
+lib/libglib.so
+lib/libgdk.so
+lib/libgtk.so
+@dirrm share/aclocal
+@dirrm lib/glib/include
+@dirrm lib/glib
 @dirrm include/gdk
 @dirrm include/gtk
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 286d930f4678..99e432493753 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -3,11 +3,12 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.10 1998/03/09 02:52:55 steve Exp $
+# $Id: Makefile,v 1.11 1998/03/14 19:47:58 vanilla Exp $
 #
 
-DISTNAME=      gtk+-0.99.5
-PKGNAME=       gtk-0.99.5
+DISTNAME=      gtk+-0.99.7
+PKGNAME=       gtk-0.99.7
+
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v0.99/
 
@@ -17,6 +18,8 @@ GNU_CONFIGURE= yes
 USE_GMAKE=     yes
 USE_X11=       yes
 
+CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
+
 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 3349499600ae..055db5e72e36 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-0.99.5.tar.gz) = f02e8c01112632855b3fa57b4d18ff51
+MD5 (gtk+-0.99.7.tar.gz) = 33ec3b0611f7a1f7b12f44f27ccc5328
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 9addf93b9eea..24f7077c1dae 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,3 +1,25 @@
+info/dir
+info/gdk.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+info/glib.info
+bin/gtk-config
+share/aclocal/gtk.m4
+lib/libglib.so.1.0
+lib/libglib.la
+lib/libglib.a
+lib/glib/include/glibconfig.h
+lib/libgdk.so.1.0
+lib/libgdk.la
+lib/libgdk.a
+lib/libgtk.so.1.0
+lib/libgtk.la
+lib/libgtk.a
+include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -5,16 +27,14 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
-include/glib.h
-include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkaspectframe.h
-include/gtk/gtkbbox.h
 include/gtk/gtkbin.h
+include/gtk/gtkbbox.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -28,6 +48,7 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
+include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -36,7 +57,6 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
-include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -52,6 +72,7 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
+include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -69,17 +90,16 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
-include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
+include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstatusbar.h
 include/gtk/gtkstyle.h
+include/gtk/gtkstatusbar.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -88,7 +108,6 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
-include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -100,26 +119,12 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/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/libgdk.a
-lib/libgdk.la
-lib/libgdk.so.1.0
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so.1.0
-lib/libgtk.a
-lib/libgtk.la
-lib/libgtk.so.1.0
-@unexec /sbin/ldconfig -R
-@exec /sbin/ldconfig -m %D/lib
+include/gtk/gtktypebuiltins.h
+lib/libglib.so
+lib/libgdk.so
+lib/libgtk.so
+@dirrm share/aclocal
+@dirrm lib/glib/include
+@dirrm lib/glib
 @dirrm include/gdk
 @dirrm include/gtk
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 286d930f4678..99e432493753 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,11 +3,12 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.10 1998/03/09 02:52:55 steve Exp $
+# $Id: Makefile,v 1.11 1998/03/14 19:47:58 vanilla Exp $
 #
 
-DISTNAME=      gtk+-0.99.5
-PKGNAME=       gtk-0.99.5
+DISTNAME=      gtk+-0.99.7
+PKGNAME=       gtk-0.99.7
+
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v0.99/
 
@@ -17,6 +18,8 @@ GNU_CONFIGURE= yes
 USE_GMAKE=     yes
 USE_X11=       yes
 
+CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
+
 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 3349499600ae..055db5e72e36 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-0.99.5.tar.gz) = f02e8c01112632855b3fa57b4d18ff51
+MD5 (gtk+-0.99.7.tar.gz) = 33ec3b0611f7a1f7b12f44f27ccc5328
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 9addf93b9eea..24f7077c1dae 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,3 +1,25 @@
+info/dir
+info/gdk.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+info/glib.info
+bin/gtk-config
+share/aclocal/gtk.m4
+lib/libglib.so.1.0
+lib/libglib.la
+lib/libglib.a
+lib/glib/include/glibconfig.h
+lib/libgdk.so.1.0
+lib/libgdk.la
+lib/libgdk.a
+lib/libgtk.so.1.0
+lib/libgtk.la
+lib/libgtk.a
+include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -5,16 +27,14 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
-include/glib.h
-include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkaspectframe.h
-include/gtk/gtkbbox.h
 include/gtk/gtkbin.h
+include/gtk/gtkbbox.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -28,6 +48,7 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
+include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -36,7 +57,6 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
-include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -52,6 +72,7 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
+include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -69,17 +90,16 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
-include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
+include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstatusbar.h
 include/gtk/gtkstyle.h
+include/gtk/gtkstatusbar.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -88,7 +108,6 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
-include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -100,26 +119,12 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/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/libgdk.a
-lib/libgdk.la
-lib/libgdk.so.1.0
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so.1.0
-lib/libgtk.a
-lib/libgtk.la
-lib/libgtk.so.1.0
-@unexec /sbin/ldconfig -R
-@exec /sbin/ldconfig -m %D/lib
+include/gtk/gtktypebuiltins.h
+lib/libglib.so
+lib/libgdk.so
+lib/libgtk.so
+@dirrm share/aclocal
+@dirrm lib/glib/include
+@dirrm lib/glib
 @dirrm include/gdk
 @dirrm include/gtk
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 286d930f4678..99e432493753 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,11 +3,12 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.10 1998/03/09 02:52:55 steve Exp $
+# $Id: Makefile,v 1.11 1998/03/14 19:47:58 vanilla Exp $
 #
 
-DISTNAME=      gtk+-0.99.5
-PKGNAME=       gtk-0.99.5
+DISTNAME=      gtk+-0.99.7
+PKGNAME=       gtk-0.99.7
+
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gtk/v0.99/
 
@@ -17,6 +18,8 @@ GNU_CONFIGURE= yes
 USE_GMAKE=     yes
 USE_X11=       yes
 
+CONFIGURE_ENV= INSTALL='/usr/bin/install -c'
+
 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 3349499600ae..055db5e72e36 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-0.99.5.tar.gz) = f02e8c01112632855b3fa57b4d18ff51
+MD5 (gtk+-0.99.7.tar.gz) = 33ec3b0611f7a1f7b12f44f27ccc5328
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 9addf93b9eea..24f7077c1dae 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,3 +1,25 @@
+info/dir
+info/gdk.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+info/glib.info
+bin/gtk-config
+share/aclocal/gtk.m4
+lib/libglib.so.1.0
+lib/libglib.la
+lib/libglib.a
+lib/glib/include/glibconfig.h
+lib/libgdk.so.1.0
+lib/libgdk.la
+lib/libgdk.a
+lib/libgtk.so.1.0
+lib/libgtk.la
+lib/libgtk.a
+include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -5,16 +27,14 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
-include/glib.h
-include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkaspectframe.h
-include/gtk/gtkbbox.h
 include/gtk/gtkbin.h
+include/gtk/gtkbbox.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -28,6 +48,7 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
+include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -36,7 +57,6 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
-include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -52,6 +72,7 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
+include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -69,17 +90,16 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
-include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
+include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstatusbar.h
 include/gtk/gtkstyle.h
+include/gtk/gtkstatusbar.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -88,7 +108,6 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
-include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -100,26 +119,12 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/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/libgdk.a
-lib/libgdk.la
-lib/libgdk.so.1.0
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so.1.0
-lib/libgtk.a
-lib/libgtk.la
-lib/libgtk.so.1.0
-@unexec /sbin/ldconfig -R
-@exec /sbin/ldconfig -m %D/lib
+include/gtk/gtktypebuiltins.h
+lib/libglib.so
+lib/libgdk.so
+lib/libgtk.so
+@dirrm share/aclocal
+@dirrm lib/glib/include
+@dirrm lib/glib
 @dirrm include/gdk
 @dirrm include/gtk