Update "gnome-libs" to version 0.30.1.

5 files changed, 50 insertions, 64 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 49061e82474..2f47681d343 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:41 garbled Exp $
+# $NetBSD: Makefile,v 1.3 1998/10/04 23:42:01 tron Exp $
 #
 
-DISTNAME=	gnome-libs-0.27
+DISTNAME=	gnome-libs-0.30.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/v0.27/ \
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/ \
-		ftp://ftp.geo.net/pub/gnome/v0.27/
+		ftp://ftp.geo.net/pub/gnome/sources/
 
 NOT_FOR_ARCHS=	alpha	# problems with gtk
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 
 DEPENDS+=	gettext-0.10:../../misc/gettext
-DEPENDS+=	gtk+-1.1.1:../../x11/gtk
+DEPENDS+=	gtk+-1.1.2:../../x11/gtk
 DEPENDS+=	tiff-3.4:../../graphics/tiff
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	giflib-3.0:../../graphics/giflib
@@ -20,6 +20,8 @@ DEPENDS+=	png-1.0.2:../../graphics/png
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	imlib-1.7:../../graphics/imlib
 
+CONFLICTS=	gnome-libs-0.27
+
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 USE_GMAKE=	yes
diff --git a/x11/gnome-libs/files/md5 b/x11/gnome-libs/files/md5
index fe1086bc862..c5eec9a506d 100644
--- a/x11/gnome-libs/files/md5
+++ b/x11/gnome-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1998/09/04 22:14:26 agc Exp $
+$NetBSD: md5,v 1.2 1998/10/04 23:42:01 tron Exp $
 
-MD5 (gnome-libs-0.27.tar.gz) = 61883a7f9d1f7d91a00dbc9e91b6b991
+MD5 (gnome-libs-0.30.1.tar.gz) = 84186592cab3f12e05653e76002f5b51
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 9b1efc03b24..d035efb90d5 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,12 +1,8 @@
-$NetBSD: patch-aa,v 1.1 1998/09/04 22:14:26 agc Exp $
+$NetBSD: patch-aa,v 1.2 1998/10/04 23:42:01 tron Exp $
 
-Use our own version of libtool
-Set CPPFLAGS correctly so that it finds all the pre-req header files
-Comment out erroneous settings of the INSTALL variable.
-
---- configure.orig	Fri Aug  7 02:01:30 1998
-+++ configure	Fri Aug 14 14:59:42 1998
-@@ -78,6 +78,9 @@
+--- configure.orig	Tue Sep 29 01:46:18 1998
++++ configure	Mon Oct  5 00:25:16 1998
+@@ -86,6 +86,9 @@
  # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
@@ -16,7 +12,7 @@ Comment out erroneous settings of the INSTALL variable.
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
  
-@@ -1621,6 +1624,7 @@
+@@ -1629,6 +1632,7 @@
  
  
  # Always use our own libtool.
@@ -24,7 +20,7 @@ Comment out erroneous settings of the INSTALL variable.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  
-@@ -1700,6 +1704,7 @@
+@@ -1708,6 +1712,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; }
@@ -32,7 +28,7 @@ Comment out erroneous settings of the INSTALL variable.
  
  
  echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-@@ -6711,10 +6716,10 @@
+@@ -7260,10 +7265,10 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -47,18 +43,3 @@ Comment out erroneous settings of the INSTALL variable.
  
    echo creating "$ac_file"
    rm -f "$ac_file"
-@@ -6980,10 +6985,10 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac
index 280a6876556..0f61cb933d3 100644
--- a/x11/gnome-libs/patches/patch-ac
+++ b/x11/gnome-libs/patches/patch-ac
@@ -1,22 +1,24 @@
-$NetBSD: patch-ac,v 1.1 1998/09/04 22:14:26 agc Exp $
+$NetBSD: patch-ac,v 1.2 1998/10/04 23:42:01 tron Exp $
 
-Use NetBSD's libtool
-
---- libgtktty/configure	1998/09/01 21:20:44	1.1
-+++ libgtktty/configure	1998/09/01 21:21:08
-@@ -1936,6 +1936,7 @@
+--- libgnome/Makefile.in.orig	Tue Sep 29 01:46:58 1998
++++ libgnome/Makefile.in	Mon Oct  5 01:20:21 1998
+@@ -136,7 +136,7 @@
  
+ lib_LTLIBRARIES = libgnome.la
  
- # Always use our own libtool.
-+if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-scoredir=$(localstatedir)/games
++scoredir=/var/games
  
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
  
-@@ -2015,6 +2016,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
+@@ -487,8 +487,8 @@
  
  
+ install-data-local:
+-	$(mkinstalldirs) $(scoredir)
+-	-chgrp games $(scoredir) && chmod g=rwXs $(scoredir)
++#	$(mkinstalldirs) $(scoredir)
++#	-chgrp games $(scoredir) && chmod g=rwXs $(scoredir)
  
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index c3a3b879580..12c7ff6644a 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 1998/09/04 22:14:27 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/10/04 23:42:01 tron Exp $
+bin/convertrgb
 bin/dns-helper
 bin/gnome_segv
 bin/gnome-config
+bin/gnome-dump-metadata
 bin/htmltest
+@exec mkdir %D/html
 include/gnome.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
@@ -21,6 +24,11 @@ include/libgnome/gnome-string.h
 include/libgnome/gnome-triggers.h
 include/libgnome/gnome-util.h
 include/libgnome/libgnome.h
+include/libgnome/gnome-metadata.h
+include/libgnome/gnome-regex.h
+include/libgnome/gnome-remote.h
+include/libgnome/lib_date.h
+include/libgnome/lib_defs.h
 include/libgnomeui/gnome-about.h
 include/libgnomeui/gnome-actionarea.h
 include/libgnomeui/gnome-app.h
@@ -56,7 +64,6 @@ include/libgnomeui/gnome-mdi.h
 include/libgnomeui/gnome-mdi-child.h
 include/libgnomeui/gnome-number-entry.h
 include/libgnomeui/gnome-net.h
-include/libgnomeui/gnome-popupmenu.h
 include/libgnomeui/gtkdial.h
 include/libgnomeui/gnome-preferences.h
 include/libgnomeui/gnome-propertybox.h
@@ -78,6 +85,10 @@ include/libgnomeui/gtk-ted.h
 include/libgnomeui/gtk-plug.h
 include/libgnomeui/gtk-socket.h
 include/libgnomeui/libgnomeui.h
+include/libgnomeui/gnome-color-picker.h
+include/libgnomeui/gnome-gtk-utils.h
+include/libgnomeui/gnome-popup-menu.h
+include/libgnomeui/gnome-winhints.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/HTML.h
 include/gtk-xmhtml/XmHTML.h
@@ -86,11 +97,6 @@ include/gtk-xmhtml/XmHTMLP.h
 include/gtk-xmhtml/gtk-xmhtml-p.h
 include/gtk-xmhtml/gtk-xmhtml.h
 include/gtk-xmhtml/toolkit.h
-include/gtktty/gtkled.h
-include/gtktty/gtkterm.h
-include/gtktty/gtkvtemu.h
-include/gtktty/gtktty.h
-include/gtktty/libgtktty.h
 include/zvt/zvtterm.h
 include/zvt/vtx.h
 include/zvt/lists.h
@@ -103,16 +109,14 @@ lib/gnome-libs/include/long-options.h
 lib/gnome-libs/include/argp.h
 lib/gnome-libs/include/error.h
 lib/gnomeConf.sh
-lib/libgnome.so.26.0
+lib/libgnome.so.30.0
 lib/libgnome.a
 lib/libgnomesupport.so.0.0
 lib/libgnomesupport.a
-lib/libgnomeui.so.26.0
+lib/libgnomeui.so.30.0
 lib/libgnomeui.a
 lib/libgtkxmhtml.so.0.0
 lib/libgtkxmhtml.a
-lib/libgtktty.so.0.4
-lib/libgtktty.a
 lib/libzvt.a
 lib/libzvt.so.0.0
 share/locale/de/LC_MESSAGES/gnome-libs.mo
@@ -127,16 +131,13 @@ share/locale/ga/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/ja/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
-share/pixmaps/calculator-font.xpm
+share/pixmaps/calculator-font.png
 share/gtkrc
 @dirrm html
 @dirrm include/libgnome
 @dirrm include/libgnomeui
 @dirrm include/gtk-xmhtml
-@dirrm include/gtktty
 @dirrm include/zvt
-@dirrm lib/X11/Gnome/var/games
-@dirrm lib/X11/Gnome/var
-@dirrm lib/X11/Gnome
 @dirrm lib/gnome-libs/include
 @dirrm lib/gnome-libs
+@dirrm share/pixmaps