Add back the gtk+-1.0.4 package, only this time as gtk10, and CONFLICTS

set accordingly.

Some packages which rely on this package require gtk version 1.0, so this
package is a temporary one until they are updated.

8 files changed, 215 insertions, 0 deletions

diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile
new file mode 100644
index 00000000000..c0a900624d9
--- /dev/null
+++ b/x11/gtk10/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 1998/08/25 11:00:49 agc Exp $
+
+DISTNAME=	gtk+-1.0.4
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.0/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.0/ \
+		ftp://ftp.flirble.org/pub/X/gimp/pub/gtk/v1.0/
+
+MAINTAINER=	bsieker@techfak.uni-bielefeld.de
+HOMEPAGE=	http://www.gtk.org/
+
+CONFLICTS=	gtk+-1.0.0 gtk+-1.1 glib-1.1.2
+
+USE_LIBTOOL=	yes
+USE_X11=	yes
+
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}"
+
+CFLAGS=		-pipe -O2
+INFO_FILES=	gdk.info glib.info gtk.info
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk10/files/md5 b/x11/gtk10/files/md5
new file mode 100644
index 00000000000..66fb4b2a5f3
--- /dev/null
+++ b/x11/gtk10/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1 1998/08/25 11:00:49 agc Exp $
+
+MD5 (gtk+-1.0.4.tar.gz) = 48852e0288f2e611aa6b248ff872678f
diff --git a/x11/gtk10/patches/patch-aa b/x11/gtk10/patches/patch-aa
new file mode 100644
index 00000000000..90ea071456c
--- /dev/null
+++ b/x11/gtk10/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 1998/08/25 11:00:50 agc Exp $
+
+--- configure.orig	Tue Jun  2 01:31:51 1998
++++ configure	Sat Jul 18 10:44:53 1998
+@@ -1231,6 +1231,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1276,7 +1277,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
++fi
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:1283: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gtk10/patches/patch-ab b/x11/gtk10/patches/patch-ab
new file mode 100644
index 00000000000..809d3fa1a8e
--- /dev/null
+++ b/x11/gtk10/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 1998/08/25 11:00:50 agc Exp $
+
+--- glib/configure.orig	Tue Jun  2 01:31:43 1998
++++ glib/configure	Sat Jul 18 10:48:59 1998
+@@ -1208,6 +1208,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1253,7 +1254,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
++fi
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:1260: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gtk10/patches/patch-ac b/x11/gtk10/patches/patch-ac
new file mode 100644
index 00000000000..5fb7cf0bbe8
--- /dev/null
+++ b/x11/gtk10/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1998/08/25 11:00:50 agc Exp $
+
+--- glib/Makefile.in.orig	Tue Jun  2 07:39:16 1998
++++ glib/Makefile.in	Wed Jul 15 23:08:25 1998
+@@ -74,7 +74,7 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
+-configincludedir = $(pkglibdir)/include
++configincludedir = @includedir@
+ 
+ lib_LTLIBRARIES = libglib.la
+ 
diff --git a/x11/gtk10/pkg/COMMENT b/x11/gtk10/pkg/COMMENT
new file mode 100644
index 00000000000..701ca9cb9ca
--- /dev/null
+++ b/x11/gtk10/pkg/COMMENT
@@ -0,0 +1 @@
+The gimp toolkit. Libraries for building X11 user interfaces.
diff --git a/x11/gtk10/pkg/DESCR b/x11/gtk10/pkg/DESCR
new file mode 100644
index 00000000000..2aa4205daab
--- /dev/null
+++ b/x11/gtk10/pkg/DESCR
@@ -0,0 +1,2 @@
+The gimp toolkit. A set of libraries for building complex X11
+user interfaces. So far only used by The Gimp.
diff --git a/x11/gtk10/pkg/PLIST b/x11/gtk10/pkg/PLIST
new file mode 100644
index 00000000000..ed86dc219ea
--- /dev/null
+++ b/x11/gtk10/pkg/PLIST
@@ -0,0 +1,130 @@
+@comment $NetBSD: PLIST,v 1.1 1998/08/25 11:00:50 agc Exp $
+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
+lib/libgdk.a
+lib/libgdk.so.1.4
+lib/libglib.a
+lib/libglib.so.1.4
+lib/libgtk.a
+lib/libgtk.so.1.4
+man/man1/gtk-config.1
+@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 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
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+share/aclocal/gtk.m4
+@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@dirrm include/gtk
+@dirrm include/gdk