Update "gnome-libs" package to version 1.0.55.

5 files changed, 19 insertions, 51 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 5a92b327225..7acff4eacf1 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2000/01/15 09:58:16 tron Exp $
+# $NetBSD: Makefile,v 1.38 2000/01/20 13:40:11 tron Exp $
 
-DISTNAME=		gnome-libs-1.0.53
+DISTNAME=		gnome-libs-1.0.55
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-libs/}
 
@@ -24,9 +24,9 @@ CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			X11BASE=${X11BASE}
 
 LOCALSTATEDIR=		/var/gnome
-
 PLIST_SRC=		${WRKDIR}/PLIST
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
+			LOCALSTATEDIR=${LOCALSTATEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -46,9 +46,8 @@ pre-build:
 
 post-install:
 	${MKDIR} ${LOCALSTATEDIR}
-	${SED} -e 's#@@LOCALSTATEDIR@@#${LOCALSTATEDIR}#' \
-	    <${PKGDIR}/PLIST >${PLIST_SRC}
-	@cd ${PREFIX}; find lib -name 'libgnome.so.*' >>${PLIST_SRC}
+	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+	cd ${PREFIX}; find lib -name 'libgnome.so.*' >>${PLIST_SRC}
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
 	  ${LOCALBASE}/share/aclocal/libart.m4
diff --git a/x11/gnome-libs/files/md5 b/x11/gnome-libs/files/md5
index b32c75e78cf..394f13d372c 100644
--- a/x11/gnome-libs/files/md5
+++ b/x11/gnome-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.13 1999/10/22 23:48:44 tron Exp $
+$NetBSD: md5,v 1.14 2000/01/20 13:40:12 tron Exp $
 
-MD5 (gnome-libs-1.0.53.tar.gz) = ce4f3c6fe20884f91584230d9b24f379
+MD5 (gnome-libs-1.0.55.tar.gz) = be8779341d598b4d5656b2383028b36c
diff --git a/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum
index 55e35fe8a41..438daccb0ea 100644
--- a/x11/gnome-libs/files/patch-sum
+++ b/x11/gnome-libs/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 1999/11/19 00:17:06 tron Exp $
+$NetBSD: patch-sum,v 1.9 2000/01/20 13:40:12 tron Exp $
 
 MD5 (patch-aa) = 297c1d95ea741c6ab965bdde59827d1f
 MD5 (patch-ab) = 911491cf3e32ffa67008d8d617f24a08
@@ -12,5 +12,4 @@ MD5 (patch-ai) = baca2d5270e60252cf5e9406bd52064d
 MD5 (patch-aj) = cb5dff8072ddfb84268ddf77453622e4
 MD5 (patch-ak) = aef962961191617c236950a2e60a289b
 MD5 (patch-al) = c3b644c6ec492fa08a0f57a203688e8e
-MD5 (patch-am) = 9080526528d73e464b2edf0ebcea5e5b
 MD5 (patch-an) = dee75a547a668dcb253b23588c7720e1
diff --git a/x11/gnome-libs/patches/patch-am b/x11/gnome-libs/patches/patch-am
deleted file mode 100644
index 538998ab9dd..00000000000
--- a/x11/gnome-libs/patches/patch-am
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/11/01 22:21:25 tron Exp $
-
---- zvt/gnome-pty-helper.c.orig	Mon Sep 27 20:35:40 1999
-+++ zvt/gnome-pty-helper.c	Mon Nov  1 22:50:19 1999
-@@ -398,13 +398,6 @@
- #endif
- 	  ;
- 	term.c_cflag = 0
--#ifdef EXTB
--	  | EXTB
--#else
--# ifdef B9600
--	  | B9600
--# endif
--#endif /* EXTB */
- #ifdef CREAD
- 	  | CREAD
- #endif
-@@ -443,6 +436,8 @@
- 	/* should really be a check for c_line, but maybe this is good enough */
- 	term.c_line = N_TTY;
- #endif
-+	cfsetispeed(&term, B9600);
-+	cfsetospeed(&term, B9600);
- 
- 	/* These two may overlap so set them first */
- 	term.c_cc[VTIME] =  0;
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 52152feb8b8..e9fc53c2ea6 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 1999/10/22 23:48:45 tron Exp $
+@comment $NetBSD: PLIST,v 1.21 2000/01/20 13:40:13 tron Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -409,7 +409,6 @@ share/gnome/help/gnome-dev-info/C/gnome-client.html
 share/gnome/help/gnome-dev-info/C/gnome-color-selector.html
 share/gnome/help/gnome-dev-info/C/gnome-defs.html
 share/gnome/help/gnome-dev-info/C/gnome-dentry.html
-share/gnome/help/gnome-dev-info/C/gnome-dev-info.html
 share/gnome/help/gnome-dev-info/C/gnome-dialog.html
 share/gnome/help/gnome-dev-info/C/gnome-dns.html
 share/gnome/help/gnome-dev-info/C/gnome-fileconvert.html
@@ -440,7 +439,6 @@ share/gnome/help/gnome-dev-info/C/gnomeappbar.html
 share/gnome/help/gnome-dev-info/C/graphics-contexts.html
 share/gnome/help/gnome-dev-info/C/gtk-clock.html
 share/gnome/help/gnome-dev-info/C/gtk-ted.html
-share/gnome/help/gnome-dev-info/C/index.html
 share/gnome/help/gnome-dev-info/C/intro.html
 share/gnome/help/gnome-dev-info/C/libgnome.html
 share/gnome/help/gnome-dev-info/C/libgnomeui.html
@@ -471,15 +469,14 @@ 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/x1025.html
-share/gnome/html/zvt/x1055.html
-share/gnome/html/zvt/x1076.html
-share/gnome/html/zvt/x1096.html
 share/gnome/html/zvt/x119.html
-share/gnome/html/zvt/x977.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/x985.html
-share/gnome/html/zvt/zvt-zvtterm.html
 share/gnome/html/zvt/zvtterm-future.html
 share/gnome/html/zvt/zvtterm-input-output.html
 share/gnome/html/zvt/zvtterm-notes.html
@@ -575,10 +572,10 @@ 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
 @dirrm share/pixmaps
 @dirrm share/type-convert
-@exec mkdir -p @@LOCALSTATEDIR@@
-@unexec rm -rf @@LOCALSTATEDIR@@
+@exec mkdir -p ${LOCALSTATEDIR}
+@unexec rm -rf ${LOCALSTATEDIR}