3 files changed, 133 insertions, 146 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 2556e9723182..2231e1d3b013 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,31 +1,24 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.0.5
+# Version required:		1.1.1
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.21 1998/07/30 05:24:38 vanilla Exp $
+# $Id: Makefile,v 1.22 1998/08/07 23:08:38 asami Exp $
 #
 
-DISTNAME=	gtk+-1.0.5
-PKGNAME=	gtk-1.0.5
+DISTNAME=	gtk+-1.1.1
+PKGNAME=	gtk-1.1.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.0/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.0/ \
-		http://www.ameth.org/gimp/pub/gtk/v1.0/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
+		http://www.ameth.org/gimp/pub/gtk/v1.1/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 CONFIGURE_ENV=	INSTALL='$${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; \
-	fi
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index d6745234a787..9fb09b85fd63 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.0.5.tar.gz) = 948121b18c4b4f1c49e8876927569dcf
+MD5 (gtk+-1.1.1.tar.gz) = 9725821ec86dbe570f45fc81b8457202
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 60474a4cf43f..0400963dd39f 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,132 +1,126 @@
-bin/gtk-config
-include/gdk/gdk.h
-include/gdk/gdkcursors.h
-include/gdk/gdki18n.h
-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/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkaspectframe.h
-include/gtk/gtkbbox.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.h
-include/gtk/gtkcheckbutton.h
-include/gtk/gtkcheckmenuitem.h
-include/gtk/gtkclist.h
-include/gtk/gtkcolorsel.h
-include/gtk/gtkcombo.h
-include/gtk/gtkcontainer.h
-include/gtk/gtkcurve.h
-include/gtk/gtkdata.h
-include/gtk/gtkdebug.h
-include/gtk/gtkdialog.h
-include/gtk/gtkdrawingarea.h
-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
-include/gtk/gtkgamma.h
-include/gtk/gtkgc.h
-include/gtk/gtkhandlebox.h
-include/gtk/gtkhbbox.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhpaned.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkinputdialog.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-include/gtk/gtkpaned.h
-include/gtk/gtkpixmap.h
-include/gtk/gtkpreview.h
-include/gtk/gtkprivate.h
-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/gtkselection.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-include/gtk/gtkspinbutton.h
-include/gtk/gtkstatusbar.h
-include/gtk/gtkstyle.h
-include/gtk/gtktable.h
-include/gtk/gtktext.h
-include/gtk/gtktipsquery.h
-include/gtk/gtktogglebutton.h
-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
-include/gtk/gtkviewport.h
-include/gtk/gtkvpaned.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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
-lib/libgdk.so.1.5
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so
-lib/libglib.so.1.5
-lib/libgtk.a
-lib/libgtk.la
-lib/libgtk.so
-lib/libgtk.so.1.5
-man/man1/gtk-config.1.gz
-share/aclocal/gtk.m4
+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/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
+lib/libgdk-1.1.a
+lib/libgdk-1.1.la
+lib/libgdk-1.1.so
+lib/libgdk-1.1.so.1.0
+lib/libgtk-1.1.a
+lib/libgtk-1.1.la
+lib/libgtk-1.1.so
+lib/libgtk-1.1.so.1.0
+share/aclocal/gtk11.m4
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
-@dirrm include/gdk
-@dirrm include/gtk
+@dirrm include/gtk11/gdk
+@dirrm include/gtk11/gtk
+@dirrm include/gtk11