update to 1.2.1

"many fixes and enhancements"

7 files changed, 71 insertions, 51 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index fe88096b3ee..2ed329782bd 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2000/05/12 09:21:12 agc Exp $
+# $NetBSD: Makefile,v 1.43 2000/05/30 19:23:46 drochner Exp $
 
-DISTNAME=		gnome-libs-1.0.56
+DISTNAME=		gnome-libs-1.2.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-libs/}
 
@@ -42,6 +42,11 @@ pre-configure:
 		${CHMOD} 0755 ${WRKSRC}/configure
 .endif
 
+post-patch:
+	${MV} ${WRKSRC}/gnome-config.in ${WRKSRC}/gnome-config.in-pre-lpath && \
+	${SED} -e "s|XXXLOCALBASEXXX|${LOCALBASE}|" \
+		${WRKSRC}/gnome-config.in-pre-lpath >${WRKSRC}/gnome-config.in
+
 pre-build:
 	(cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h)
 
diff --git a/x11/gnome-libs/files/md5 b/x11/gnome-libs/files/md5
index 9f5684463ce..e5117dea261 100644
--- a/x11/gnome-libs/files/md5
+++ b/x11/gnome-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.15 2000/03/13 22:25:46 tron Exp $
+$NetBSD: md5,v 1.16 2000/05/30 19:23:47 drochner Exp $
 
-MD5 (gnome-libs-1.0.56.tar.gz) = fd2941e2a7fd89afd39c962fd0791003
+MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15
diff --git a/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum
index 0402c5683a8..2a4ba96eadb 100644
--- a/x11/gnome-libs/files/patch-sum
+++ b/x11/gnome-libs/files/patch-sum
@@ -1,15 +1,15 @@
-$NetBSD: patch-sum,v 1.12 2000/05/02 18:48:43 danw Exp $
+$NetBSD: patch-sum,v 1.13 2000/05/30 19:23:47 drochner Exp $
 
-MD5 (patch-aa) = 715bc6cdaf104758be2302ab29f086e7
+MD5 (patch-aa) = 3fe8121a6a1a494658e5eb7466266a4e
 MD5 (patch-ab) = 911491cf3e32ffa67008d8d617f24a08
 MD5 (patch-ac) = 2234ccfc4f168c91bb2fc8686ed0590c
 MD5 (patch-ad) = c39cc321a208c5bf22aa8d07af9dd1a4
 MD5 (patch-ae) = 1c36b5b59dd826c0d015d7d5d110ae44
 MD5 (patch-af) = f14189c93bd7152e87cd5520823fc0d5
 MD5 (patch-ag) = 44c356ffb86853b201740f377091e89b
-MD5 (patch-ah) = b36ca92cad14f1562229f0b507ac8c9e
+MD5 (patch-ah) = cc281f4fffa1c5e7e3565a86c256f08b
 MD5 (patch-ai) = baca2d5270e60252cf5e9406bd52064d
-MD5 (patch-aj) = cb5dff8072ddfb84268ddf77453622e4
+MD5 (patch-aj) = d159a31728619f93385e77b26d7f8123
 MD5 (patch-ak) = aef962961191617c236950a2e60a289b
 MD5 (patch-al) = c3b644c6ec492fa08a0f57a203688e8e
 MD5 (patch-an) = dee75a547a668dcb253b23588c7720e1
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 36492a10c14..5e462f8b28c 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,18 +1,26 @@
-$NetBSD: patch-aa,v 1.9 2000/05/02 18:48:43 danw Exp $
+$NetBSD: patch-aa,v 1.10 2000/05/30 19:23:48 drochner Exp $
 
---- configure.orig	Tue Feb 22 15:29:37 2000
-+++ configure	Mon Mar 13 23:08:16 2000
-@@ -2077,7 +2077,9 @@
+--- configure.orig	Sat May 20 20:55:16 2000
++++ configure	Fri May 26 23:39:02 2000
+@@ -2000,7 +2000,7 @@
  fi
+ rm -f confcache
  
- # Always use our own libtool.
+-
 +if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+@@ -2029,7 +2029,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
+-
 +fi
  
- # Check for any special flags to pass to ltconfig.
- libtool_flags=
-@@ -5587,7 +5589,7 @@
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:2036: checking whether to enable maintainer-specific portions of Makefiles" >&5
+@@ -5304,7 +5304,7 @@
    
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -21,7 +29,7 @@ $NetBSD: patch-aa,v 1.9 2000/05/02 18:48:43 danw Exp $
  
  
  echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
-@@ -10496,7 +10498,7 @@
+@@ -10213,7 +10213,7 @@
  GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
diff --git a/x11/gnome-libs/patches/patch-ah b/x11/gnome-libs/patches/patch-ah
index 5f1a1fdd491..5a757c8b93c 100644
--- a/x11/gnome-libs/patches/patch-ah
+++ b/x11/gnome-libs/patches/patch-ah
@@ -1,14 +1,21 @@
-$NetBSD: patch-ah,v 1.3 1999/11/15 18:47:56 rh Exp $
+$NetBSD: patch-ah,v 1.4 2000/05/30 19:23:48 drochner Exp $
 
---- libart_lgpl/configure.orig	Mon Nov 15 19:20:56 1999
-+++ libart_lgpl/configure	Mon Nov 15 19:20:56 1999
-@@ -1624,7 +1624,9 @@
- fi
+--- libart_lgpl/configure.orig	Sat May 20 20:55:17 2000
++++ libart_lgpl/configure	Sat May 27 10:57:15 2000
+@@ -1437,6 +1437,8 @@
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
  
- # Always use our own libtool.
 +if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case "$lt_target" in
+@@ -1577,6 +1579,7 @@
+ # clobbered by the next message.
+ exec 5>>./config.log
+ 
 +fi
  
- # Check for any special flags to pass to ltconfig.
- libtool_flags=
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:1583: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gnome-libs/patches/patch-aj b/x11/gnome-libs/patches/patch-aj
index d1773f569b9..55ade992b94 100644
--- a/x11/gnome-libs/patches/patch-aj
+++ b/x11/gnome-libs/patches/patch-aj
@@ -1,8 +1,17 @@
-$NetBSD: patch-aj,v 1.1 1999/05/01 15:10:42 tron Exp $
+$NetBSD: patch-aj,v 1.2 2000/05/30 19:23:48 drochner Exp $
 
---- gnome-config.in.orig	Mon Feb 15 19:05:33 1999
-+++ gnome-config.in	Sat May  1 16:56:02 1999
-@@ -213,7 +213,7 @@
+--- gnome-config.in.orig	Tue Sep  7 21:25:26 1999
++++ gnome-config.in	Tue May 30 17:56:22 2000
+@@ -40,6 +40,8 @@
+     module_dirs="$extra:$module_dirs"
+ done
+ 
++module_dirs="XXXLOCALBASEXXX/lib:$module_dirs"
++
+ usage()
+ {
+     exit_code=$1
+@@ -239,7 +241,7 @@
      case "$i" in
      # a library, save it for later, in reverse order
      -l*) rev_libs="$i $rev_libs" ;;
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 30d23a50da0..c743988f950 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2000/03/13 22:25:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.23 2000/05/30 19:23:48 drochner Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -60,6 +60,8 @@ include/libart_lgpl/art_vpath.h
 include/libart_lgpl/art_vpath_bpath.h
 include/libart_lgpl/art_vpath_dash.h
 include/libart_lgpl/art_vpath_svp.h
+include/libart_lgpl/libart.h
+include/libart_lgpl/libart-features.h
 include/libgnome/gnome-config.h
 include/libgnome/gnome-defs.h
 include/libgnome/gnome-dentry.h
@@ -152,6 +154,7 @@ include/libgnomeui/gnome-startup.h
 include/libgnomeui/gnome-stock.h
 include/libgnomeui/gnome-types.h
 include/libgnomeui/gnome-uidefs.h
+include/libgnomeui/gnome-window-icon.h
 include/libgnomeui/gnome-winhints.h
 include/libgnomeui/gnometypebuiltins.h
 include/libgnomeui/gtk-clock.h
@@ -173,12 +176,12 @@ lib/gnome-libs/include/gnomesupport.h
 lib/gnomeConf.sh
 lib/libartConf.sh
 lib/libart_lgpl.a
-lib/libart_lgpl.so.3.0
+lib/libart_lgpl.so.4.0
 lib/libgnome.a
 lib/libgnomesupport.a
 lib/libgnomesupport.so.0.0
 lib/libgnomeui.a
-lib/libgnomeui.so.42.3
+lib/libgnomeui.so.43.2
 lib/libgnorba.a
 lib/libgnorba.so.28.8
 lib/libgnorbagtk.a
@@ -186,7 +189,7 @@ lib/libgnorbagtk.so.0.0
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.so.1.1
 lib/libzvt.a
-lib/libzvt.so.4.6
+lib/libzvt.so.4.7
 man/man1/gnome-config.1
 man/man1/gnome.1
 man/man5/gnome-mime.5
@@ -309,6 +312,7 @@ share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-properties.html
 share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-property-entries.html
 share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-types.html
 share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-uidefs.html
+share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-window-icon.html
 share/doc/gnome-libs/html/gnomeui/gnomeui-gnome-winhints.html
 share/doc/gnome-libs/html/gnomeui/gnomeui-gtkcauldron.html
 share/doc/gnome-libs/html/gnomeui/gtkclock.html
@@ -468,22 +472,6 @@ share/gnome/html/gnorba/book1.html
 share/gnome/html/gnorba/gnorba-gnorba.html
 share/gnome/html/gnorba/gnorba-goad.html
 share/gnome/html/gnorba/libgnorba.html
-share/gnome/html/zvt/book1.html
-share/gnome/html/zvt/x119.html
-share/gnome/html/zvt/x144.html
-share/gnome/html/zvt/x152.html
-share/gnome/html/zvt/x192.html
-share/gnome/html/zvt/x222.html
-share/gnome/html/zvt/x243.html
-share/gnome/html/zvt/x263.html
-share/gnome/html/zvt/x98.html
-share/gnome/html/zvt/zvtterm-future.html
-share/gnome/html/zvt/zvtterm-input-output.html
-share/gnome/html/zvt/zvtterm-notes.html
-share/gnome/html/zvt/zvtterm-properties.html
-share/gnome/html/zvt/zvtterm-reference.html
-share/gnome/html/zvt/zvtterm-window-hints.html
-share/gnome/html/zvt/zvtterm.html
 share/gtkrc
 share/gtkrc.el
 share/gtkrc.eo
@@ -534,8 +522,10 @@ share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
+share/locale/ro/LC_MESSAGES/gnome-libs.mo
 share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sk/LC_MESSAGES/gnome-libs.mo
+share/locale/sl/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 share/locale/wa/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
@@ -573,6 +563,7 @@ share/type-convert/type.convert
 @dirrm share/gnome/html/gnorba
 @dirrm share/gnome/html/zvt
 @dirrm share/gnome/html
+@dirrm share/gnome
 @unexec rmdir %D/etc/httpd 2>/dev/null || true
 @dirrm share/idl
 @dirrm share/mime-info