Update oaf to 0.5.1. Changes include:

	* Compile fixes for gcc 2.96, docs (Anders Carlsson)

	* Added factory skeletons to liboaf

	* Renamed gnome-factory.idl to oaf-factory.idl, and renamed
	  GNOME::GenericFactory to GNOME::ObjectFactory (Mathieu Lacage,
	  Maciej Stachowiak)

	* Preliminary API docs (Mathieu Lacage)

	* -Werror turned off for releases, by popular demand

	* Renamed "Attribute" to "Property" throughout, since "attribute"
	  is an IDL reserved word. (ERDI Gergo, Maciej Stachowiak)

	* Fix compilation with builddir != srcdir (Mathieu Lacage)

	* Improved handling of duplicate oafinfo files. (Mathieu Lacage)

	* Turkish, German, Russian, Danish, Norwegian translations
	  (translation team)

	* Added internationalization support (Mathieu Lacage)

	* Renamed `supports' method to `manufactures' in
	  GNOME::GenericFactory interface. (ERDI Gergo)

	* Added support for /etc/oaf-config.xml to tell OAF where to
	  look for oafinfo files.

	* Added timeout for servers that don't register themselves
	  (Michael Meeks)

	* Added support for GNOME_PATH environment variable (Mathieu
	  Lacage)

	* Numerous build fixes (Robin * Slomkowski)

	* oaf-slay program (Michael Meeks)

	* Improved test program (Michael Meeks)

	* IID validation (Michael Meeks)

11 files changed, 85 insertions, 60 deletions

diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 6fae57df893..1981cf5fd8f 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/16 19:44:17 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/29 16:26:20 rh Exp $
 #
 
-DISTNAME=		oaf-0.4.0
+DISTNAME=		oaf-0.5.1
 CATEGORIES=		FILLTHISINPLEASE
 MASTER_SITES=		${MASTER_SITE_GNOME:=/unstable/sources/oaf/}
 
@@ -17,6 +17,6 @@ USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include"
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include -I${LOCALBASE}/include"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/oaf/files/md5 b/devel/oaf/files/md5
index a87035be13e..b4a467cf105 100644
--- a/devel/oaf/files/md5
+++ b/devel/oaf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
+$NetBSD: md5,v 1.2 2000/08/29 16:26:20 rh Exp $
 
-MD5 (oaf-0.4.0.tar.gz) = dffd5f6f0c3a42d7e428b55bc52f92b1
+MD5 (oaf-0.5.1.tar.gz) = 6e0cfcb089bbd9e7ca41d86d4d504d2a
diff --git a/devel/oaf/files/patch-sum b/devel/oaf/files/patch-sum
index e9fe3a565e3..eecad0008bb 100644
--- a/devel/oaf/files/patch-sum
+++ b/devel/oaf/files/patch-sum
@@ -1,9 +1,12 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/29 16:26:20 rh Exp $
 
-MD5 (patch-aa) = 0f38e77f2fee850f99a0b958e67c2b85
+MD5 (patch-aa) = 833e6196cce17a146b56bfbd41de2ad3
 MD5 (patch-ab) = cfca1ca6d4dc9cc83f9b4e96e4c0bcd7
-MD5 (patch-ac) = 00b0d20ddf90e01006d1227f051d147d
-MD5 (patch-ad) = f8ec3b629a2a42f61f6d852d2a68a3ee
+MD5 (patch-ac) = e3d5ba7f4061eb023229f3ee1114dba9
+MD5 (patch-ad) = e3cbecdd49e7d9213eba2fb89d4abd67
 MD5 (patch-ae) = 2ce2bdaaf3853016a7d0a078ee52ceb7
 MD5 (patch-af) = c37a023c494d23ad9487e45ec02e2fda
-MD5 (patch-ag) = 251f0eb1e03fccf9180f835467abe61b
+MD5 (patch-ag) = df66af53d407e4d2410baea3df053244
+MD5 (patch-ah) = 2275fe07c9f545c1b2c4e3c303aa8e67
+MD5 (patch-ai) = 9a6fb26905605ec6a432fe4772b8eda0
+MD5 (patch-aj) = b8d37556f1da12978c812eb847c7cf9a
diff --git a/devel/oaf/patches/patch-aa b/devel/oaf/patches/patch-aa
deleted file mode 100644
index 0bbe38659c8..00000000000
--- a/devel/oaf/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
-
---- idl/Makefile.in.orig	Tue Jul  4 00:10:32 2000
-+++ idl/Makefile.in	Sun Jul 16 20:35:37 2000
-@@ -90,7 +90,7 @@
- YACC = @YACC@
- 
- idldir = $(datadir)/idl
--idl_DATA = oaf.idl gnome-factory.idl
-+idl_DATA = oaf.idl gnome-factory-oaf.idl
- EXTRA_DIST = $(idl_DATA)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -177,6 +177,8 @@
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(idldir)
- 
-+gnome-factory-oaf.idl: gnome-factory.idl
-+	cp gnome-factory.idl gnome-factory-oaf.idl
- 
- mostlyclean-generic:
- 
diff --git a/devel/oaf/patches/patch-ac b/devel/oaf/patches/patch-ac
deleted file mode 100644
index adbd60ed90d..00000000000
--- a/devel/oaf/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
-
---- liboaf/Makefile.in.orig	Tue Jul  4 00:10:32 2000
-+++ liboaf/Makefile.in	Sun Jul 16 20:33:37 2000
-@@ -392,8 +392,8 @@
- 	$(ORBIT_IDL) --noskels -I$(top_srcdir)/idl --define=OAF_COMPILATION $(top_srcdir)/idl/oaf.idl
- 	touch stamp-idl
- 
--gnome-factory.h stamp-factory-idl: $(top_srcdir)/idl/gnome-factory.idl
--	$(ORBIT_IDL) --noskels -I$(top_srcdir)/idl --define=GNOME_FACTORY_COMPILATION $(top_srcdir)/idl/gnome-factory.idl
-+gnome-factory.h stamp-factory-idl: $(top_srcdir)/idl/gnome-factory-oaf.idl
-+	$(ORBIT_IDL) --noskels -I$(top_srcdir)/idl --define=GNOME_FACTORY_COMPILATION $(top_srcdir)/idl/gnome-factory-oaf.idl
- 	touch stamp-factory-idl
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/devel/oaf/patches/patch-ad b/devel/oaf/patches/patch-ad
index dfa60e9bc76..c48aec8fa54 100644
--- a/devel/oaf/patches/patch-ad
+++ b/devel/oaf/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/29 16:26:20 rh Exp $
 
---- oafd/main.c.orig	Fri Jun  2 04:45:24 2000
-+++ oafd/main.c	Sun Jul 16 20:33:37 2000
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+--- oafd/main.c.orig	Tue Aug 29 16:49:11 2000
++++ oafd/main.c
+@@ -26,7 +26,7 @@
  #include "config.h"
+ #include "oaf-i18n.h"
  
 -#include <popt.h>
 +#include <popt-gnome.h>
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index d8c686c3db2..3d04c86caa3 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
+$NetBSD: patch-ag,v 1.2 2000/08/29 16:26:20 rh Exp $
 
---- configure.orig	Mon Jul  3 23:59:03 2000
-+++ configure	Sun Jul 16 20:33:37 2000
-@@ -3347,8 +3347,7 @@
+--- configure.orig	Sun Aug 13 11:52:08 2000
++++ configure
+@@ -3556,7 +3556,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
+@@ -5151,8 +5151,7 @@
  	-Wall -Wno-uninitialized \
  	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
  	-Wnested-externs -Wpointer-arith \
diff --git a/devel/oaf/patches/patch-ah b/devel/oaf/patches/patch-ah
new file mode 100644
index 00000000000..afeef056ff0
--- /dev/null
+++ b/devel/oaf/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2000/08/29 16:26:20 rh Exp $
+
+--- utils/oaf-sysconf.c.orig	Tue Aug 29 17:09:21 2000
++++ utils/oaf-sysconf.c
+@@ -29,7 +29,7 @@
+ #include <tree.h>        /* gnome-xml */
+ #include <parser.h>      /* gnome-xml */
+ #include <xmlmemory.h>   /* gnome-xml */
+-#include <popt.h>        /* popt :) */
++#include <popt-gnome.h>
+ #include "od-utils.h"
+ 
+ 
diff --git a/devel/oaf/patches/patch-ai b/devel/oaf/patches/patch-ai
new file mode 100644
index 00000000000..401b1b3faf3
--- /dev/null
+++ b/devel/oaf/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2000/08/29 16:26:20 rh Exp $
+
+--- utils/Makefile.in.orig	Tue Aug 29 17:11:43 2000
++++ utils/Makefile.in
+@@ -226,7 +226,7 @@
+ 
+ oaf-sysconf: $(oaf_sysconf_OBJECTS) $(oaf_sysconf_DEPENDENCIES)
+ 	@rm -f oaf-sysconf
+-	$(LINK) $(oaf_sysconf_LDFLAGS) $(oaf_sysconf_OBJECTS) $(oaf_sysconf_LDADD) $(LIBS)
++	$(LINK) $(oaf_sysconf_LDFLAGS) $(oaf_sysconf_OBJECTS) $(oaf_sysconf_LDADD) $(LIBS) ${INTLLIBS}
+ 
+ tags: TAGS
+ 
diff --git a/devel/oaf/patches/patch-aj b/devel/oaf/patches/patch-aj
new file mode 100644
index 00000000000..121bc22d4fb
--- /dev/null
+++ b/devel/oaf/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2000/08/29 16:26:21 rh Exp $
+
+--- test/Makefile.in.orig	Tue Aug 29 17:15:25 2000
++++ test/Makefile.in
+@@ -489,7 +489,7 @@
+ 	touch empty_built
+ 
+ oaf-slay: $(srcdir)/oaf-slay.tmpl
+-	sed 's|@oafdir@|'$(pkgdatadir)'|g' < $< > $@
++	sed 's|@oafdir@|'$(pkgdatadir)'|g' < $(srcdir)/oaf-slay.tmpl > $@
+ 
+ # 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.
diff --git a/devel/oaf/pkg/PLIST b/devel/oaf/pkg/PLIST
index 069dc9d0be5..466e62acc87 100644
--- a/devel/oaf/pkg/PLIST
+++ b/devel/oaf/pkg/PLIST
@@ -1,21 +1,32 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/29 16:26:21 rh Exp $
 bin/oafd
 bin/oaf-client
 bin/oaf-run-query
 bin/oaf-config
+bin/oaf-slay
+bin/oaf-sysconf
+etc/oaf/oaf-config.xml
+etc/oaf/oaf-config.xml.sample
 include/liboaf/oaf.h
 include/liboaf/liboaf.h
-include/liboaf/gnome-factory.h
 include/liboaf/liboaf-version.h
+include/liboaf/oaf-factory-suppress.h
+include/liboaf/oaf-factory.h
 lib/liboaf.so.0.0
 lib/liboaf.la
 lib/liboaf.a
 lib/oafConf.sh
 share/aclocal/oaf.m4
-share/idl/gnome-factory-oaf.idl
 share/idl/oaf.idl
+share/idl/oaf-factory.idl
+share/locale/da/LC_MESSAGES/oaf.mo
+share/locale/de/LC_MESSAGES/oaf.mo
+share/locale/fr/LC_MESSAGES/oaf.mo
+share/locale/no/LC_MESSAGES/oaf.mo
+share/locale/ru/LC_MESSAGES/oaf.mo
+share/locale/tr/LC_MESSAGES/oaf.mo
 share/oaf/oafd.oafinfo
 share/oaf/empty.oafinfo
-share/oaf/broken.oafinfo
+@dirrm etc/oaf
 @dirrm include/liboaf
 @dirrm share/oaf