Upgrade to 1.1.7,

I change library name to libgtk11d,
and gtk-config to gtk11d-config.

3 files changed, 147 insertions, 152 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b34e46b1e3e3..14026a6f9315 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   gtk
-# Version required:		1.1.2
+# New ports collection makefile for:   gtk11-devel
+# Version required:		1.1.7
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.31 1998/12/10 13:18:16 vanilla Exp $
+# $Id: Makefile,v 1.32 1998/12/10 14:30:28 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.2
-PKGNAME=	gtk-1.1.2
+DISTNAME=	gtk+-1.1.7
+PKGNAME=	gtk-1.1.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,24 +15,15 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	glib11.0:${PORTSDIR}/devel/glib
-
-BROKEN=		upgrade
+LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
-
-MAN1=		gtk-config.1
-
-pre-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
+CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 13bf0800541d..072f73bca142 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index a2e5b964889f..4bbc747f9bf4 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,135 +1,139 @@
-bin/gtk11-config
-include/gtk11/gdk/gdk.h
-include/gtk11/gdk/gdkcursors.h
-include/gtk11/gdk/gdki18n.h
-include/gtk11/gdk/gdkkeysyms.h
-include/gtk11/gdk/gdkprivate.h
-include/gtk11/gdk/gdkrgb.h
-include/gtk11/gdk/gdktypes.h
-include/gtk11/gdk/gdkx.h
-include/gtk11/gtk/gtk.h
-include/gtk11/gtk/gtkaccelgroup.h
-include/gtk11/gtk/gtkaccellabel.h
-include/gtk11/gtk/gtkadjustment.h
-include/gtk11/gtk/gtkalignment.h
-include/gtk11/gtk/gtkarg.h
-include/gtk11/gtk/gtkarrow.h
-include/gtk11/gtk/gtkaspectframe.h
-include/gtk11/gtk/gtkbbox.h
-include/gtk11/gtk/gtkbin.h
-include/gtk11/gtk/gtkbindings.h
-include/gtk11/gtk/gtkbox.h
-include/gtk11/gtk/gtkbutton.h
-include/gtk11/gtk/gtkcheckbutton.h
-include/gtk11/gtk/gtkcheckmenuitem.h
-include/gtk11/gtk/gtkclist.h
-include/gtk11/gtk/gtkcolorsel.h
-include/gtk11/gtk/gtkcombo.h
-include/gtk11/gtk/gtkcontainer.h
-include/gtk11/gtk/gtkctree.h
-include/gtk11/gtk/gtkcurve.h
-include/gtk11/gtk/gtkdata.h
-include/gtk11/gtk/gtkdebug.h
-include/gtk11/gtk/gtkdialog.h
-include/gtk11/gtk/gtkdrawingarea.h
-include/gtk11/gtk/gtkeditable.h
-include/gtk11/gtk/gtkentry.h
-include/gtk11/gtk/gtkenums.h
-include/gtk11/gtk/gtkeventbox.h
-include/gtk11/gtk/gtkfeatures.h
-include/gtk11/gtk/gtkfilesel.h
-include/gtk11/gtk/gtkfixed.h
-include/gtk11/gtk/gtkfontsel.h
-include/gtk11/gtk/gtkframe.h
-include/gtk11/gtk/gtkgamma.h
-include/gtk11/gtk/gtkgc.h
-include/gtk11/gtk/gtkhandlebox.h
-include/gtk11/gtk/gtkhbbox.h
-include/gtk11/gtk/gtkhbox.h
-include/gtk11/gtk/gtkhpaned.h
-include/gtk11/gtk/gtkhruler.h
-include/gtk11/gtk/gtkhscale.h
-include/gtk11/gtk/gtkhscrollbar.h
-include/gtk11/gtk/gtkhseparator.h
-include/gtk11/gtk/gtkimage.h
-include/gtk11/gtk/gtkinputdialog.h
-include/gtk11/gtk/gtkitem.h
-include/gtk11/gtk/gtkitemfactory.h
-include/gtk11/gtk/gtklabel.h
-include/gtk11/gtk/gtklist.h
-include/gtk11/gtk/gtklistitem.h
-include/gtk11/gtk/gtkmain.h
-include/gtk11/gtk/gtkmarshal.h
-include/gtk11/gtk/gtkmenu.h
-include/gtk11/gtk/gtkmenubar.h
-include/gtk11/gtk/gtkmenufactory.h
-include/gtk11/gtk/gtkmenuitem.h
-include/gtk11/gtk/gtkmenushell.h
-include/gtk11/gtk/gtkmisc.h
-include/gtk11/gtk/gtknotebook.h
-include/gtk11/gtk/gtkobject.h
-include/gtk11/gtk/gtkoptionmenu.h
-include/gtk11/gtk/gtkpacker.h
-include/gtk11/gtk/gtkpaned.h
-include/gtk11/gtk/gtkpixmap.h
-include/gtk11/gtk/gtkpreview.h
-include/gtk11/gtk/gtkprivate.h
-include/gtk11/gtk/gtkprogress.h
-include/gtk11/gtk/gtkprogressbar.h
-include/gtk11/gtk/gtkradiobutton.h
-include/gtk11/gtk/gtkradiomenuitem.h
-include/gtk11/gtk/gtkrange.h
-include/gtk11/gtk/gtkrc.h
-include/gtk11/gtk/gtkruler.h
-include/gtk11/gtk/gtkscale.h
-include/gtk11/gtk/gtkscrollbar.h
-include/gtk11/gtk/gtkscrolledwindow.h
-include/gtk11/gtk/gtkselection.h
-include/gtk11/gtk/gtkseparator.h
-include/gtk11/gtk/gtksignal.h
-include/gtk11/gtk/gtkspinbutton.h
-include/gtk11/gtk/gtkstatusbar.h
-include/gtk11/gtk/gtkstyle.h
-include/gtk11/gtk/gtktable.h
-include/gtk11/gtk/gtktearoffmenuitem.h
-include/gtk11/gtk/gtktext.h
-include/gtk11/gtk/gtktipsquery.h
-include/gtk11/gtk/gtktogglebutton.h
-include/gtk11/gtk/gtktoolbar.h
-include/gtk11/gtk/gtktooltips.h
-include/gtk11/gtk/gtktree.h
-include/gtk11/gtk/gtktreeitem.h
-include/gtk11/gtk/gtktypebuiltins.h
-include/gtk11/gtk/gtktypeutils.h
-include/gtk11/gtk/gtkvbbox.h
-include/gtk11/gtk/gtkvbox.h
-include/gtk11/gtk/gtkviewport.h
-include/gtk11/gtk/gtkvpaned.h
-include/gtk11/gtk/gtkvruler.h
-include/gtk11/gtk/gtkvscale.h
-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.2
-lib/libgtk11.a
-lib/libgtk11.la
-lib/libgtk11.so
-lib/libgtk11.so.1.2
+bin/gtk11d-config
+include/gtk11d/gdk/gdk.h
+include/gtk11d/gdk/gdkcursors.h
+include/gtk11d/gdk/gdki18n.h
+include/gtk11d/gdk/gdkkeysyms.h
+include/gtk11d/gdk/gdkprivate.h
+include/gtk11d/gdk/gdkrgb.h
+include/gtk11d/gdk/gdktypes.h
+include/gtk11d/gdk/gdkx.h
+include/gtk11d/gtk/gtk.h
+include/gtk11d/gtk/gtkaccelgroup.h
+include/gtk11d/gtk/gtkaccellabel.h
+include/gtk11d/gtk/gtkadjustment.h
+include/gtk11d/gtk/gtkalignment.h
+include/gtk11d/gtk/gtkarg.h
+include/gtk11d/gtk/gtkarrow.h
+include/gtk11d/gtk/gtkaspectframe.h
+include/gtk11d/gtk/gtkbbox.h
+include/gtk11d/gtk/gtkbin.h
+include/gtk11d/gtk/gtkbindings.h
+include/gtk11d/gtk/gtkbox.h
+include/gtk11d/gtk/gtkbutton.h
+include/gtk11d/gtk/gtkcalendar.h
+include/gtk11d/gtk/gtkcheckbutton.h
+include/gtk11d/gtk/gtkcheckmenuitem.h
+include/gtk11d/gtk/gtkclist.h
+include/gtk11d/gtk/gtkcolorsel.h
+include/gtk11d/gtk/gtkcombo.h
+include/gtk11d/gtk/gtkcompat.h
+include/gtk11d/gtk/gtkcontainer.h
+include/gtk11d/gtk/gtkctree.h
+include/gtk11d/gtk/gtkcurve.h
+include/gtk11d/gtk/gtkdata.h
+include/gtk11d/gtk/gtkdebug.h
+include/gtk11d/gtk/gtkdialog.h
+include/gtk11d/gtk/gtkdnd.h
+include/gtk11d/gtk/gtkdrawingarea.h
+include/gtk11d/gtk/gtkdrawwindow.h
+include/gtk11d/gtk/gtkeditable.h
+include/gtk11d/gtk/gtkentry.h
+include/gtk11d/gtk/gtkenums.h
+include/gtk11d/gtk/gtkeventbox.h
+include/gtk11d/gtk/gtkfeatures.h
+include/gtk11d/gtk/gtkfilesel.h
+include/gtk11d/gtk/gtkfixed.h
+include/gtk11d/gtk/gtkfontsel.h
+include/gtk11d/gtk/gtkframe.h
+include/gtk11d/gtk/gtkgamma.h
+include/gtk11d/gtk/gtkgc.h
+include/gtk11d/gtk/gtkhandlebox.h
+include/gtk11d/gtk/gtkhbbox.h
+include/gtk11d/gtk/gtkhbox.h
+include/gtk11d/gtk/gtkhpaned.h
+include/gtk11d/gtk/gtkhruler.h
+include/gtk11d/gtk/gtkhscale.h
+include/gtk11d/gtk/gtkhscrollbar.h
+include/gtk11d/gtk/gtkhseparator.h
+include/gtk11d/gtk/gtkimage.h
+include/gtk11d/gtk/gtkinputdialog.h
+include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkitem.h
+include/gtk11d/gtk/gtkitemfactory.h
+include/gtk11d/gtk/gtklabel.h
+include/gtk11d/gtk/gtklayout.h
+include/gtk11d/gtk/gtklist.h
+include/gtk11d/gtk/gtklistitem.h
+include/gtk11d/gtk/gtkmain.h
+include/gtk11d/gtk/gtkmarshal.h
+include/gtk11d/gtk/gtkmenu.h
+include/gtk11d/gtk/gtkmenubar.h
+include/gtk11d/gtk/gtkmenufactory.h
+include/gtk11d/gtk/gtkmenuitem.h
+include/gtk11d/gtk/gtkmenushell.h
+include/gtk11d/gtk/gtkmisc.h
+include/gtk11d/gtk/gtknotebook.h
+include/gtk11d/gtk/gtkobject.h
+include/gtk11d/gtk/gtkoptionmenu.h
+include/gtk11d/gtk/gtkpacker.h
+include/gtk11d/gtk/gtkpaned.h
+include/gtk11d/gtk/gtkpixmap.h
+include/gtk11d/gtk/gtkplug.h
+include/gtk11d/gtk/gtkpreview.h
+include/gtk11d/gtk/gtkprivate.h
+include/gtk11d/gtk/gtkprogress.h
+include/gtk11d/gtk/gtkprogressbar.h
+include/gtk11d/gtk/gtkradiobutton.h
+include/gtk11d/gtk/gtkradiomenuitem.h
+include/gtk11d/gtk/gtkrange.h
+include/gtk11d/gtk/gtkrc.h
+include/gtk11d/gtk/gtkruler.h
+include/gtk11d/gtk/gtkscale.h
+include/gtk11d/gtk/gtkscrollbar.h
+include/gtk11d/gtk/gtkscrolledwindow.h
+include/gtk11d/gtk/gtkselection.h
+include/gtk11d/gtk/gtkseparator.h
+include/gtk11d/gtk/gtksignal.h
+include/gtk11d/gtk/gtksocket.h
+include/gtk11d/gtk/gtkspinbutton.h
+include/gtk11d/gtk/gtkstatusbar.h
+include/gtk11d/gtk/gtkstyle.h
+include/gtk11d/gtk/gtktable.h
+include/gtk11d/gtk/gtktearoffmenuitem.h
+include/gtk11d/gtk/gtktext.h
+include/gtk11d/gtk/gtkthemes.h
+include/gtk11d/gtk/gtktipsquery.h
+include/gtk11d/gtk/gtktogglebutton.h
+include/gtk11d/gtk/gtktoolbar.h
+include/gtk11d/gtk/gtktooltips.h
+include/gtk11d/gtk/gtktree.h
+include/gtk11d/gtk/gtktreeitem.h
+include/gtk11d/gtk/gtktypebuiltins.h
+include/gtk11d/gtk/gtktypeutils.h
+include/gtk11d/gtk/gtkvbbox.h
+include/gtk11d/gtk/gtkvbox.h
+include/gtk11d/gtk/gtkviewport.h
+include/gtk11d/gtk/gtkvpaned.h
+include/gtk11d/gtk/gtkvruler.h
+include/gtk11d/gtk/gtkvscale.h
+include/gtk11d/gtk/gtkvscrollbar.h
+include/gtk11d/gtk/gtkvseparator.h
+include/gtk11d/gtk/gtkwidget.h
+include/gtk11d/gtk/gtkwindow.h
+lib/libgdk11d.a
+lib/libgdk11d.la
+lib/libgdk11d.so
+lib/libgdk11d.so.1
+lib/libgtk11d.a
+lib/libgtk11d.la
+lib/libgtk11d.so
+lib/libgtk11d.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/gtk11/gdk
-@dirrm include/gtk11/gtk
-@dirrm include/gtk11
+share/themes/Default/gtk/gtkrc
+@dirrm share/themes/Default/gtk
+@dirrm share/themes/Default
+@dirrm share/themes
+@dirrm include/gtk11d/gdk
+@dirrm include/gtk11d/gtk
+@dirrm include/gtk11d