Update "gnome-libs" package to version 0.99.0 and make it build again.

XXX At the moment some files are installed at the wrong place (e.g "doc"
XXX or "share/doc" instead of "share/doc/gnome-libs"). Other files should
XXX not be installed at all (e.g. "lib/libart_lgpl.la").

6 files changed, 180 insertions, 97 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index e2e9fd1116d..2494dc3bcde 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 1998/12/15 09:46:59 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/12/29 14:23:04 tron Exp $
 #
 
-DISTNAME=	gnome-libs-0.30.1
+DISTNAME=	gnome-libs-0.99.0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/ \
@@ -9,32 +9,32 @@ MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 
 MAINTAINER=	tron@netbsd.org
 
-DEPENDS+=	gettext-0.10:../../misc/gettext
-DEPENDS+=	gtk+-1.1.3:../../x11/gtk
+DEPENDS+=	gtk+-1.1.9:../../x11/gtk
 DEPENDS+=	tiff-3.4:../../graphics/tiff
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	png-1.0.2:../../graphics/png
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=	imlib-1.8.1:../../graphics/imlib
-DEPENDS+=	ORBit-0.3.0:../../corba/ORBit
+DEPENDS+=	imlib-1.8.2:../../graphics/imlib
+DEPENDS+=	ORBit-0.3.90:../../corba/ORBit
 
 NOT_FOR_ARCHS=	alpha	# problems with gtk
 
-CONFLICTS=	gnome-libs-0.27
-
-IGNORE=		"can\'t be built before a new snapshot is released."
+CONFLICTS=	gnome-libs-*
 
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-
-LOCALSTATEDIR=	/var/gnome
-
+LDFLAGS+=       	"-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
+			INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+			LOCALBASE=${LOCALBASE} \
+			X11BASE=${X11BASE}
+
+LOCALSTATEDIR=	/var/gnome
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
diff --git a/x11/gnome-libs/files/md5 b/x11/gnome-libs/files/md5
index c5eec9a506d..27b8e9bc753 100644
--- a/x11/gnome-libs/files/md5
+++ b/x11/gnome-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/10/04 23:42:01 tron Exp $
+$NetBSD: md5,v 1.3 1998/12/29 14:23:04 tron Exp $
 
-MD5 (gnome-libs-0.30.1.tar.gz) = 84186592cab3f12e05653e76002f5b51
+MD5 (gnome-libs-0.99.0.tar.gz) = b55b99e6229129324c17ad9f57a0df43
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index d035efb90d5..324dfd443f3 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,34 +1,24 @@
-$NetBSD: patch-aa,v 1.2 1998/10/04 23:42:01 tron Exp $
+$NetBSD: patch-aa,v 1.3 1998/12/29 14:23:04 tron Exp $
 
---- 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=
-+CFLAGS="-I../intl -I$X11BASE/include -I$LOCALBASE/include"
-+CPPFLAGS="-I../intl -I$X11BASE/include -I$LOCALBASE/include -I$LOCALBASE/include/giflib"
-+LDFLAGS="-L$X11BASE/lib -L$LOCALBASE/lib"
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -1629,6 +1632,7 @@
- 
+--- configure.orig	Wed Dec 16 10:52:23 1998
++++ configure	Tue Dec 29 12:43:37 1998
+@@ -1674,6 +1674,7 @@
+ fi
  
  # Always use our own libtool.
 +if false; then
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
- 
-@@ -1708,6 +1712,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ # Check for any special flags to pass to ltconfig.
+@@ -1718,6 +1719,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $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
-@@ -7260,10 +7265,10 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -9515,10 +9517,10 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -43,3 +33,18 @@ $NetBSD: patch-aa,v 1.2 1998/10/04 23:42:01 tron Exp $
  
    echo creating "$ac_file"
    rm -f "$ac_file"
+@@ -9788,10 +9790,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 0f61cb933d3..d74b3fb8e71 100644
--- a/x11/gnome-libs/patches/patch-ac
+++ b/x11/gnome-libs/patches/patch-ac
@@ -1,24 +1,30 @@
-$NetBSD: patch-ac,v 1.2 1998/10/04 23:42:01 tron Exp $
+$NetBSD: patch-ac,v 1.3 1998/12/29 14:23:04 tron Exp $
 
---- 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 @@
+--- libgnome/gnome-gen-mimedb.c.orig	Wed Dec 16 07:48:42 1998
++++ libgnome/gnome-gen-mimedb.c	Tue Dec 29 14:39:59 1998
+@@ -1,10 +1,14 @@
+ #include <stdio.h>
++#include <string.h>
  
- lib_LTLIBRARIES = libgnome.la
+ #define GEN_MIMEDB 1
+ #include "gnome-magic.c"
  
--scoredir=$(localstatedir)/games
-+scoredir=/var/games
+ extern GnomeMagicEntry *gnome_magic_parse (const char *filename, int *nents);
  
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++char *program_invocation_name;
++char *program_invocation_short_name;
++
+ int main(int argc, char *argv[])
+ {
+   GnomeMagicEntry *ents = NULL;
+@@ -16,6 +20,10 @@
  
-@@ -487,8 +487,8 @@
+   gnome_do_not_create_directories = 1;
+   gnomelib_init("gnome-gen-mimedb", VERSION);
++
++  program_invocation_name = argv[0];
++  if ((program_invocation_short_name = strrchr(argv[0], '/')) == NULL)
++    program_invocation_short_name = argv[0];
  
- 
- 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.
+   if(argc > 1) {
+     if(argv[1][0] == '-') {
diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad
index 829a6ad08a6..e038cc12dff 100644
--- a/x11/gnome-libs/patches/patch-ad
+++ b/x11/gnome-libs/patches/patch-ad
@@ -1,9 +1,7 @@
-$NetBSD: patch-ad,v 1.1 1998/09/04 22:14:26 agc Exp $
+$NetBSD: patch-ad,v 1.2 1998/12/29 14:23:04 tron Exp $
 
-Don't try to strip a script.
-
---- Makefile.in	1998/09/02 07:47:48	1.1
-+++ Makefile.in	1998/09/02 07:47:53
+--- Makefile.in.orig	Wed Dec 16 10:56:22 1998
++++ Makefile.in	Sat Dec 19 21:08:41 1998
 @@ -51,7 +51,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -13,3 +11,12 @@ Don't try to strip a script.
  transform = @program_transform_name@
  
  NORMAL_INSTALL = :
+@@ -153,7 +153,7 @@
+ # just distribute it, since we can 
+ @FALSE_TRUE@libvfs = libvfs
+ 
+-SUBDIRS = po intl support macros \
++SUBDIRS = intl support macros \
+ 	tools \
+ 	libart_lgpl \
+ 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt \
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index de0e8f2175c..d7918c6ad34 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,36 +1,102 @@
-@comment $NetBSD: PLIST,v 1.3 1998/10/05 12:08:08 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/12/29 14:23:04 tron Exp $
 bin/convertrgb
 bin/dns-helper
-bin/gnome_segv
+bin/gconfigger
+bin/libart-config
+bin/loadshlib
 bin/gnome-config
 bin/gnome-dump-metadata
-bin/htmltest
+bin/gnome-gen-mimedb
+bin/gnome-moz-remote
+bin/gnome-name-service
+bin/gnome_segv
+bin/goad-browser
+doc/README.gtkcauldron
+doc/README.gtkcauldron_for_python
+doc/adding-sounds.txt
+doc/api-comment-style.txt
+doc/gtk_dialog_cauldron.3
+doc/suggestions.txt
+doc/mime-type-handling.txt
+etc/mime-magic
+etc/mime-magic.dat
+etc/paper.config
+etc/sound/events/gnome.soundlist
+etc/sound/events/gtk-events.soundlist
 @exec mkdir %D/html
 include/gnome.h
+include/popt-gnome.h
+include/libart_lgpl/art_affine.h
+include/libart_lgpl/art_bpath.h
+include/libart_lgpl/art_filterlevel.h
+include/libart_lgpl/art_gray_svp.h
+include/libart_lgpl/art_misc.h
+include/libart_lgpl/art_pathcode.h
+include/libart_lgpl/art_point.h
+include/libart_lgpl/art_rect.h
+include/libart_lgpl/art_rect_uta.h
+include/libart_lgpl/art_rgb.h
+include/libart_lgpl/art_rgb_affine.h
+include/libart_lgpl/art_rgb_bitmap_affine.h
+include/libart_lgpl/art_rgb_rgba_affine.h
+include/libart_lgpl/art_rgb_svp.h
+include/libart_lgpl/art_svp.h
+include/libart_lgpl/art_svp_ops.h
+include/libart_lgpl/art_svp_render_aa.h
+include/libart_lgpl/art_svp_vpath.h
+include/libart_lgpl/art_svp_vpath_stroke.h
+include/libart_lgpl/art_uta.h
+include/libart_lgpl/art_uta_ops.h
+include/libart_lgpl/art_uta_rect.h
+include/libart_lgpl/art_uta_vpath.h
+include/libart_lgpl/art_uta_svp.h
+include/libart_lgpl/art_vpath.h
+include/libart_lgpl/art_vpath_bpath.h
+include/libart_lgpl/art_vpath_svp.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-fileconvert.h
-include/libgnome/gnome-hook.h
-include/libgnome/gnome-dl.h
 include/libgnome/gnome-dentry.h
 include/libgnome/gnome-exec.h
 include/libgnome/gnome-help.h
 include/libgnome/gnome-history.h
 include/libgnome/gnome-i18n.h
 include/libgnome/gnome-mime.h
-include/libgnome/gnome-parse.h
+include/libgnome/gnome-mime-info.h
+include/libgnome/gnome-paper.h
+include/libgnome/gnome-popt.h
 include/libgnome/gnome-score.h
-include/libgnome/gnome-string.h
+include/libgnome/gnome-sound.h
 include/libgnome/gnome-triggers.h
+include/libgnome/gnome-url.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-animator.h
+include/libgnomeui/gnome-canvas-polygon.h
+include/libgnomeui/gnome-dock.h
+include/libgnomeui/gnome-dock-band.h
+include/libgnomeui/gnome-dock-item.h
+include/libgnomeui/gnome-dock-layout.h
+include/libgnomeui/gnome-font-picker.h
+include/libgnomeui/gnome-guru.h
+include/libgnomeui/gnome-href.h
+include/libgnomeui/gnome-icon-item.h
+include/libgnomeui/gnome-icon-text.h
+include/libgnomeui/gnome-icon-entry.h
+include/libgnomeui/gnome-init.h
+include/libgnomeui/gnome-mdi-generic-child.h
+include/libgnomeui/gnome-mdi-session.h
+include/libgnomeui/gnome-popup-help.h
+include/libgnomeui/gnome-property-entries.h
+include/libgnomeui/gnome-pixmap-entry.h
+include/libgnomeui/gnome-spell.h
+include/libgnomeui/gnome-paper-selector.h
+include/libgnomeui/gnome-procbar.h
+include/libgnomeui/gtkpixmapmenuitem.h
 include/libgnomeui/gnome-about.h
-include/libgnomeui/gnome-actionarea.h
 include/libgnomeui/gnome-app.h
 include/libgnomeui/gnome-appbar.h
 include/libgnomeui/gnome-app-helper.h
@@ -44,7 +110,6 @@ include/libgnomeui/gnome-canvas-text.h
 include/libgnomeui/gnome-canvas-util.h
 include/libgnomeui/gnome-canvas-widget.h
 include/libgnomeui/gnome-client.h
-include/libgnomeui/gnome-color-selector.h
 include/libgnomeui/gnome-dateedit.h
 include/libgnomeui/gnome-dentry-edit.h
 include/libgnomeui/gnome-dialog.h
@@ -57,13 +122,11 @@ include/libgnomeui/gnome-geometry.h
 include/libgnomeui/gnome-ice.h
 include/libgnomeui/gnome-icon-list.h
 include/libgnomeui/gnome-icon-sel.h
-include/libgnomeui/gnome-lamp.h
 include/libgnomeui/gnome-less.h
 include/libgnomeui/gnome-messagebox.h
 include/libgnomeui/gnome-mdi.h
 include/libgnomeui/gnome-mdi-child.h
 include/libgnomeui/gnome-number-entry.h
-include/libgnomeui/gnome-net.h
 include/libgnomeui/gtkdial.h
 include/libgnomeui/gnome-preferences.h
 include/libgnomeui/gnome-propertybox.h
@@ -71,24 +134,19 @@ include/libgnomeui/gnome-properties.h
 include/libgnomeui/gnome-pixmap.h
 include/libgnomeui/gnome-scores.h
 include/libgnomeui/gnome-startup.h
-include/libgnomeui/gnome-rootwin.h
 include/libgnomeui/gnome-stock.h
 include/libgnomeui/gnome-types.h
 include/libgnomeui/gnome-uidefs.h
 include/libgnomeui/gnometypebuiltins.h
-include/libgnomeui/gtkcalendar.h
 include/libgnomeui/gtkcauldron.h
-include/libgnomeui/gtklayout.h
-include/libgnomeui/gtkspell.h
 include/libgnomeui/gtk-clock.h
 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/libgnorba/gnorba.h
+include/libgnorba/gnome-factory.h
 include/gtk-xmhtml/miniparse.h
 include/gtk-xmhtml/HTML.h
 include/gtk-xmhtml/XmHTML.h
@@ -100,46 +158,53 @@ include/gtk-xmhtml/toolkit.h
 include/zvt/zvtterm.h
 include/zvt/vtx.h
 include/zvt/lists.h
-include/zvt/subshell.h
 include/zvt/vt.h
 lib/gnome-libs/include/gnomesupport.h
-lib/gnome-libs/include/gnome-argp.h
-lib/gnome-libs/include/getopt.h
-lib/gnome-libs/include/long-options.h
-lib/gnome-libs/include/argp.h
-lib/gnome-libs/include/error.h
+lib/gnome-libs/include/popt-gnome.h
 lib/gnomeConf.sh
+lib/libart_lgpl.a
+lib/libart_lgpl.so.0.0
+lib/libart_lgpl.la
+lib/libartConf.sh
 lib/libgnome.so.30.0
 lib/libgnome.a
 lib/libgnomesupport.so.0.0
 lib/libgnomesupport.a
 lib/libgnomeui.so.30.0
 lib/libgnomeui.a
+lib/libgnorba.so.26.0
+lib/libgnorba.a
 lib/libgtkxmhtml.so.0.0
 lib/libgtkxmhtml.a
 lib/libzvt.a
 lib/libzvt.so.0.0
-share/locale/de/LC_MESSAGES/gnome-libs.mo
-share/locale/fr/LC_MESSAGES/gnome-libs.mo
-share/locale/it/LC_MESSAGES/gnome-libs.mo
-share/locale/ko/LC_MESSAGES/gnome-libs.mo
-share/locale/cs/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
-share/locale/no/LC_MESSAGES/gnome-libs.mo
-share/locale/fi/LC_MESSAGES/gnome-libs.mo
-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
+sbin/gnome-pty-helper
+share/aclocal/libart.m4
+share/doc/gnome-doc.el
+share/doc/gnome-doc
+share/doc/mkstub
+share/idl/name-service.idl
+share/idl/gnome-factory.idl
+share/idl/Table.idl
+share/mime-info/gnome.mime
 share/pixmaps/calculator-font.png
+share/pixmaps/yes.xpm
+share/pixmaps/no.xpm
 share/gtkrc
+@dirrm doc
+@dirrm etc/sound/events
+@dirrm etc/sound
 @dirrm html
+@dirrm include/libgnorba
 @dirrm include/libgnome
 @dirrm include/libgnomeui
+@dirrm include/libart_lgpl
 @dirrm include/gtk-xmhtml
 @dirrm include/zvt
 @dirrm lib/gnome-libs/include
 @dirrm lib/gnome-libs
+@dirrm share/idl
+@dirrm share/mime-info
 @dirrm share/pixmaps
 @exec mkdir -p @@LOCALSTATEDIR@@
 @unexec rm -rf @@LOCALSTATEDIR@@