Update oaf to 0.6.10

  * evil activation races
  * alloca issue
  * handle IO_PRI
  * more regression tests
  * don't multiply parse oafinfo files
  * racing activations far more efficient
  * remove multiple directory capability
  * Fix oaf-slay username detection
  * Fix for multiple activation race condition
  * New translations

7 files changed, 59 insertions, 83 deletions

diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 7d6420172d9..8443350a8b4 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2002/04/09 17:39:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/05/18 10:54:16 mjl Exp $
 #
 
-DISTNAME=		oaf-0.6.7
-PKGREVISION=		1
+DISTNAME=		oaf-0.6.10
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/oaf/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/oaf/PLIST b/devel/oaf/PLIST
index 9fbd387df14..befc113be80 100644
--- a/devel/oaf/PLIST
+++ b/devel/oaf/PLIST
@@ -1,16 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/15 23:55:38 rh Exp $
-bin/oafd
+@comment $NetBSD: PLIST,v 1.3 2002/05/18 10:54:16 mjl Exp $
 bin/oaf-client
-bin/oaf-run-query
 bin/oaf-config
 bin/oaf-empty-server
+bin/oaf-run-query
 bin/oaf-slay
 bin/oaf-sysconf
+bin/oafd
 etc/oaf/oaf-config.xml
 etc/oaf/oaf-config.xml.sample
-include/liboaf/oaf.h
-include/liboaf/liboaf.h
 include/liboaf/liboaf-version.h
+include/liboaf/liboaf.h
 include/liboaf/oaf-actid.h
 include/liboaf/oaf-activate.h
 include/liboaf/oaf-async.h
@@ -21,43 +20,48 @@ include/liboaf/oaf-plugin.h
 include/liboaf/oaf-registration.h
 include/liboaf/oaf-servreg.h
 include/liboaf/oaf-util.h
+include/liboaf/oaf.h
+lib/liboaf.a
+lib/liboaf.la
 lib/liboaf.so
 lib/liboaf.so.0
 lib/liboaf.so.0.0
-lib/liboaf.la
 lib/oafConf.sh
 man/man1/oafd.1
 share/aclocal/oaf.m4
-share/idl/oaf.idl
 share/idl/oaf-factory.idl
-share/locale/az/LC_MESSAGES/oaf.mo
-share/locale/da/LC_MESSAGES/oaf.mo
-share/locale/de/LC_MESSAGES/oaf.mo
-share/locale/el/LC_MESSAGES/oaf.mo
-share/locale/es/LC_MESSAGES/oaf.mo
-share/locale/fi/LC_MESSAGES/oaf.mo
-share/locale/fr/LC_MESSAGES/oaf.mo
-share/locale/ga/LC_MESSAGES/oaf.mo
-share/locale/gl/LC_MESSAGES/oaf.mo
-share/locale/hu/LC_MESSAGES/oaf.mo
-share/locale/it/LC_MESSAGES/oaf.mo
-share/locale/ja/LC_MESSAGES/oaf.mo
-share/locale/ko/LC_MESSAGES/oaf.mo
-share/locale/nl/LC_MESSAGES/oaf.mo
-share/locale/nn/LC_MESSAGES/oaf.mo
-share/locale/no/LC_MESSAGES/oaf.mo
-share/locale/pl/LC_MESSAGES/oaf.mo
-share/locale/pt/LC_MESSAGES/oaf.mo
-share/locale/pt_BR/LC_MESSAGES/oaf.mo
-share/locale/ro/LC_MESSAGES/oaf.mo
-share/locale/ru/LC_MESSAGES/oaf.mo
-share/locale/sk/LC_MESSAGES/oaf.mo
-share/locale/sl/LC_MESSAGES/oaf.mo
-share/locale/sv/LC_MESSAGES/oaf.mo
-share/locale/ta/LC_MESSAGES/oaf.mo
-share/locale/tr/LC_MESSAGES/oaf.mo
-share/locale/uk/LC_MESSAGES/oaf.mo
-share/locale/zh_TW/LC_MESSAGES/oaf.mo
+share/idl/oaf.idl
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/oaf.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/oaf.mo
 share/oaf/OAF_naming-service.oaf
 share/oaf/empty.oafinfo
 @dirrm etc/oaf
diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo
index d38d4a26e2c..c3f824ca716 100644
--- a/devel/oaf/distinfo
+++ b/devel/oaf/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/01/15 23:55:38 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/05/18 10:54:16 mjl Exp $
 
-SHA1 (oaf-0.6.7.tar.bz2) = 079bc5675b28182ae8ea41957c81ae669170950d
-Size (oaf-0.6.7.tar.bz2) = 423449 bytes
-SHA1 (patch-aa) = 4fd412cae8eff2a1a8bfe01402773ca233f36d6d
-SHA1 (patch-ac) = aab19adb68c1969f7714e6ee0fe918e1905bd60d
-SHA1 (patch-ad) = ef16360bc1f0549ee75969eb6742d884220fb04d
-SHA1 (patch-ag) = b121bc495f623529080c88a95b707b2b4796e5f9
+SHA1 (oaf-0.6.10.tar.bz2) = d8eaff6b3bc953fc4158f55b03ba92cb197518c5
+Size (oaf-0.6.10.tar.bz2) = 435621 bytes
+SHA1 (patch-ac) = 28fd433c41209b9f3355e5f039f4f9d30b940a55
+SHA1 (patch-ag) = 57f54e650bacad8ef82c0165ba395ec225e372dc
diff --git a/devel/oaf/patches/patch-aa b/devel/oaf/patches/patch-aa
deleted file mode 100644
index d8ae3d9b6e5..00000000000
--- a/devel/oaf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/01/16 03:11:56 rh Exp $
-
---- oafd/qsort_ex.c.orig	Tue Sep  4 14:07:43 2001
-+++ oafd/qsort_ex.c
-@@ -26,7 +26,7 @@
- #include <string.h>
- #include "qsort_ex.h"
- 
--#if HAVE_ALLOCA
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
- 
diff --git a/devel/oaf/patches/patch-ac b/devel/oaf/patches/patch-ac
index 763e2646c4b..e2db5f3cbcb 100644
--- a/devel/oaf/patches/patch-ac
+++ b/devel/oaf/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/08/31 05:39:56 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/05/18 10:54:17 mjl Exp $
 
---- liboaf/Makefile.in.orig	Tue Aug 29 17:07:06 2000
-+++ liboaf/Makefile.in
-@@ -242,7 +242,7 @@
+--- liboaf/Makefile.in.orig	Sat May 18 12:22:48 2002
++++ liboaf/Makefile.in	Sat May 18 12:23:02 2002
+@@ -270,7 +270,7 @@
  maintainer-clean-libtool:
  
  liboaf.la: $(liboaf_la_OBJECTS) $(liboaf_la_DEPENDENCIES)
diff --git a/devel/oaf/patches/patch-ad b/devel/oaf/patches/patch-ad
deleted file mode 100644
index c4838e254ce..00000000000
--- a/devel/oaf/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2001/10/01 11:01:03 rh Exp $
-
---- oafd/main.c.orig	Tue Jul 24 00:50:25 2001
-+++ oafd/main.c
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <locale.h>
- #include <popt.h>
- #include <signal.h>
- #include <stdlib.h>
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index f676c699cac..49401b8dd58 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.5 2001/10/01 11:01:04 rh Exp $
+$NetBSD: patch-ag,v 1.6 2002/05/18 10:54:18 mjl Exp $
 
---- configure.orig	Tue Aug 21 07:45:23 2001
-+++ configure
-@@ -7215,7 +7215,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+--- configure.orig	Sat May 18 12:24:35 2002
++++ configure	Sat May 18 12:25:54 2002
+@@ -9196,7 +9196,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -		   DATADIRNAME=lib
 +		   DATADIRNAME=share
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
-@@ -8825,7 +8825,6 @@
+@@ -11009,7 +11009,6 @@
  	-Wall \
  	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
  	-Wnested-externs -Wpointer-arith \