Update "gtk+" package to version 1.1.9.

6 files changed, 60 insertions, 31 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index a8abd262230..3c7dcc03b2f 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.20 1998/11/21 22:15:15 tron Exp $
+# $NetBSD: Makefile,v 1.21 1998/12/18 23:53:15 tron Exp $
 
-DISTNAME=	gtk+-1.1.3
+DISTNAME=	gtk+-1.1.9
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/ \
-		ftp://ftp.flirble.org/pub/X/gimp/pub/gtk/v1.1/
+		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
+		http://www.ameth.org/gimp/pub/gtk/v1.1/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gtk.org/
 
-DEPENDS+=	glib-1.1.4:../../devel/glib
+DEPENDS+=	gettext-0.10:../../misc/gettext
+DEPENDS+=	glib-1.1.9:../../devel/glib
 
-CONFLICTS=	gtk+-1.0.0 gtk+-1.0.4 gtk+-1.1.1 gtk+-1.1.2
+CONFLICTS=	gtk+-*
 
 USE_LIBTOOL=	yes
 USE_X11=	yes
@@ -19,9 +21,13 @@ USE_GMAKE=	yes
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+		INSTALL_DATA="${INSTALL_DATA}" \
+		CPPFLAGS="${CPPFLAGS}"
 
-CFLAGS=		-pipe -O2
 INFO_FILES=	gdk.info gtk.info
 
+CFLAGS=		-pipe -O2
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index a29aaf56e1c..9f7a0486c90 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1998/11/21 22:15:15 tron Exp $
+$NetBSD: md5,v 1.8 1998/12/18 23:53:16 tron Exp $
 
-MD5 (gtk+-1.1.3.tar.gz) = a021cabaf8dec713d35bbd5d4e62681f
+MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 5c9992afc06..8c23830dc56 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 1998/11/21 22:15:15 tron Exp $
+$NetBSD: patch-ab,v 1.8 1998/12/18 23:53:16 tron Exp $
 
---- gdk/Makefile.in.orig	Tue Sep 22 05:47:10 1998
-+++ gdk/Makefile.in	Sun Oct  4 20:09:56 1998
-@@ -141,7 +141,7 @@
- 	gdkx.h
+--- gdk/Makefile.in.orig	Thu Dec 17 07:33:51 1998
++++ gdk/Makefile.in	Fri Dec 18 23:50:07 1998
+@@ -180,7 +180,7 @@
+ 	-lm
  
  libgdk_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-          @x_ldflags@ @x_libs@
- 
- INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
+          @GLIB_LIBS@	\
+          @x_ldflags@	\
+          @x_libs@	\
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
index fe232eba10e..1491c49e562 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.5 1998/11/21 22:15:15 tron Exp $
+$NetBSD: patch-ac,v 1.6 1998/12/18 23:53:16 tron Exp $
 
---- gtk/Makefile.in.orig	Tue Sep 22 05:47:15 1998
-+++ gtk/Makefile.in	Sun Oct  4 20:10:29 1998
-@@ -330,7 +330,7 @@
- # makeenums.h: @REBUILD@ gtk.h gtkprivate.h
+--- gtk/Makefile.in.orig	Thu Dec 17 07:33:52 1998
++++ gtk/Makefile.in	Fri Dec 18 23:52:34 1998
+@@ -369,7 +369,7 @@
+ 	../gdk/gdkrgb.h
  
  libgtk_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- EXTRA_DIST = \
- 	line-arrow.xbm 		\
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 	@GLIB_LIBS@ 			\
+ 	@x_ldflags@			\
+ 	@x_libs@ 			\
diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad
new file mode 100644
index 00000000000..8f80191f877
--- /dev/null
+++ b/x11/gtk/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 1998/12/18 23:53:16 tron Exp $
+
+--- Makefile.in.orig	Sat Dec 19 00:07:51 1998
++++ Makefile.in	Sat Dec 19 00:07:22 1998
+@@ -118,7 +118,7 @@
+ xinput_progs = @xinput_progs@
+ 
+ SRC_SUBDIRS = gdk gtk
+-SUBDIRS = po $(SRC_SUBDIRS) docs
++SUBDIRS = $(SRC_SUBDIRS) docs
+ 
+ bin_SCRIPTS = gtk-config
+ 
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 1149526ad55..0d8cd055fbd 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 1998/11/21 22:15:15 tron Exp $
+@comment $NetBSD: PLIST,v 1.15 1998/12/18 23:53:16 tron Exp $
 bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkrgb.h
@@ -115,9 +115,15 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-lib/libgdk.so.3.0
+include/gtk/gtkcompat.h
+include/gtk/gtklayout.h
+include/gtk/gtkplug.h
+include/gtk/gtksocket.h
+include/gtk/gtkthemes.h
+include/gtk/gtkintl.h
+lib/libgdk.so.9.0
 lib/libgdk.a
-lib/libgtk.so.3.0
+lib/libgtk.so.9.0
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
@@ -133,6 +139,10 @@ info/gtk.info-4
 info/gtk.info-5
 info/gtk.info-6
 share/aclocal/gtk.m4
+share/themes/Default/gtk/gtkrc
 @unexec rmdir %D/share/aclocal 2>/dev/null || true
 @dirrm include/gtk
 @dirrm include/gdk
+@dirrm share/themes/Default/gtk
+@dirrm share/themes/Default
+@dirrm share/themes