Update oaf to 0.6.7

New in this release:
 * Fix major race condition which could lead to multiple oafd's
 * Miscellaneous bug fixes
 * FreeBSD fixes
 * Build fixes
 * Merge lots of bug fixes from former 2.0 branch
 * spec file updates

4 files changed, 16 insertions, 12 deletions

diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 58bc5aded33..6c2a06accdb 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/10/03 20:46:21 rh Exp $
+# $NetBSD: Makefile,v 1.14 2002/01/15 23:55:37 rh Exp $
 #
 
-DISTNAME=		oaf-0.6.6
+DISTNAME=		oaf-0.6.7
 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 64400814b7f..9fbd387df14 100644
--- a/devel/oaf/PLIST
+++ b/devel/oaf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:25:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/15 23:55:38 rh Exp $
 bin/oafd
 bin/oaf-client
 bin/oaf-run-query
@@ -26,11 +26,14 @@ 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
@@ -40,9 +43,11 @@ 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
@@ -52,12 +57,9 @@ 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.Big5/LC_MESSAGES/oaf.mo
+share/locale/zh_TW/LC_MESSAGES/oaf.mo
 share/oaf/OAF_naming-service.oaf
 share/oaf/empty.oafinfo
-@exec mkdir -p %D/share/oaf/html/liboaf
 @dirrm etc/oaf
 @dirrm include/liboaf
-@dirrm share/oaf/html/liboaf
-@dirrm share/oaf/html
 @dirrm share/oaf
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index 678ffb7d80f..caf22a420fc 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/01/13 11:45:31 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/01/15 23:55:38 rh Exp $
 #
 # This Makefile fragment is included by packages that use oaf.
 #
@@ -17,7 +17,7 @@ OAF_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.oaf?=	oaf>=0.6.6
+BUILDLINK_DEPENDS.oaf?=	oaf>=0.6.7
 DEPENDS+=	${BUILDLINK_DEPENDS.oaf}:../../devel/oaf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.oaf=oaf
@@ -28,6 +28,7 @@ BUILDLINK_FILES.oaf+=		lib/oafConf.sh
 
 .include "../../textproc/libxml/buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
 
 BUILDLINK_TARGETS.oaf=		oaf-buildlink
 BUILDLINK_TARGETS.oaf+=		oaf-buildlink-config-wrapper
diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo
index d7e2c5e0e18..d38d4a26e2c 100644
--- a/devel/oaf/distinfo
+++ b/devel/oaf/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/10/01 11:01:03 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/01/15 23:55:38 rh Exp $
 
-SHA1 (oaf-0.6.6.tar.bz2) = 7901f68362c7decc2b6c964dd319c31cddbd4096
-Size (oaf-0.6.6.tar.bz2) = 393159 bytes
+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