Update oaf to 0.6.5.

Notable changes are:

oaf-0.6.5
---------

New in this release fixed the perl5.00404 bug
NO other changes

====================================
oaf-0.6.4
---------

New in this release

* fixed Unregistering servers causes failure when activating a
  re-registered version (mjs)

* fixed automounter problems (mjs)

* fixed popt options (Darin)

* added Romanian support (Dan Damian)

====================================
oaf-0.6.3
---------

New in this release:

* Memory leak fixes (Maciej, migras)

* SunOS support for oaf-slay (Michael)

* Assorted bug fixes (Maciej)

* Added new query language operator `prefer_by_list_order' for
  preferring particular components in priority order when available.

* Change working directory to "/" to avoiding mount issues

* Fix bug that made uloading shlib servers impossible (Maciej)

* New translations (Gustavo Maciel Dias Vieira)


====================================
oaf-0.6.2
---------

New in this release:

* Leak fixes (Ali)

* xml-18n-toolize (Maciej)

* Add DTD for oafinfo files (Maciej)

* Rewrite and clean up oafinfo loading code; make it accept .oaf as
  well as .oafinfo files (.oaf is the preferred naming now) (Maciej)

* Pass IOR by environment variable, not command line arg for security

* Doc updates (Mathieu, John R. Sheets)

* Assorted portability fixes (Jason Leach)

* libxml 1.x/2.x compatibility (Darin)

* Build fixes (Eskil, Mathieu, Maciej)

* Assorted bug fixes (Michael)

* New translations (Szabolcs BAN, Stanislav Visnovsky)

8 files changed, 82 insertions, 35 deletions

diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 849afb77ef7..286bcc5d11e 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 14:38:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/04/06 21:55:39 rh Exp $
 #
 
-DISTNAME=		oaf-0.6.1
+DISTNAME=		oaf-0.6.5
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/oaf/}
 
@@ -11,7 +11,6 @@ COMMENT=		new object activation framework for GNOME
 
 DEPENDS+=		gnome-libs>=1.2.3:../../x11/gnome-libs
 DEPENDS+=		libxml>=1.8.10:../../textproc/libxml
-DEPENDS+=		popt-*:../../devel/popt
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
diff --git a/devel/oaf/files/md5 b/devel/oaf/files/md5
index 7667d70a095..2ea5a852e20 100644
--- a/devel/oaf/files/md5
+++ b/devel/oaf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/12/31 09:58:53 rh Exp $
+$NetBSD: md5,v 1.5 2001/04/06 21:55:39 rh Exp $
 
-MD5 (oaf-0.6.1.tar.gz) = d225e45e64a60716bbb29b9169272d5f
+SHA1 (oaf-0.6.5.tar.gz) = 50a78e04ceedb16591cb4f03ee63ee28c53a5b1c
diff --git a/devel/oaf/files/patch-sum b/devel/oaf/files/patch-sum
index 92472ca0564..4980915c5a9 100644
--- a/devel/oaf/files/patch-sum
+++ b/devel/oaf/files/patch-sum
@@ -1,12 +1,13 @@
-$NetBSD: patch-sum,v 1.4 2001/01/02 22:11:31 tron Exp $
+$NetBSD: patch-sum,v 1.5 2001/04/06 21:55:39 rh Exp $
 
-MD5 (patch-aa) = 833e6196cce17a146b56bfbd41de2ad3
-MD5 (patch-ab) = cfca1ca6d4dc9cc83f9b4e96e4c0bcd7
-MD5 (patch-ac) = e3d5ba7f4061eb023229f3ee1114dba9
-MD5 (patch-ad) = db6a51d2748b66c8e851b14db74fb895
-MD5 (patch-ae) = 2ce2bdaaf3853016a7d0a078ee52ceb7
-MD5 (patch-af) = c37a023c494d23ad9487e45ec02e2fda
-MD5 (patch-ag) = 1406fd5e6b81c62c00f37bf45037144f
-MD5 (patch-ah) = 2275fe07c9f545c1b2c4e3c303aa8e67
-MD5 (patch-ai) = 9a6fb26905605ec6a432fe4772b8eda0
-MD5 (patch-aj) = b8d37556f1da12978c812eb847c7cf9a
+SHA1 (patch-aa) = 19bd9038ffb933630c3d8040d7a34a54112814bb
+SHA1 (patch-ab) = db5966e5e649315b96f99e3aeb06a55dd2582ed5
+SHA1 (patch-ac) = aab19adb68c1969f7714e6ee0fe918e1905bd60d
+SHA1 (patch-ad) = f1aef87562f3c91ca91bdf342cbbb96ec3cfb369
+SHA1 (patch-ae) = c7e4ba6dad4efc1b52a4c6551a0ea925cc912d6e
+SHA1 (patch-af) = ccae84893cd2a244f921481c28cdf9874dff15bb
+SHA1 (patch-ag) = 2457347d0414293cdd36e7771daba55ea80c3c60
+SHA1 (patch-ah) = 1aff198b6e76ef78898dd94cfb34750b1fb585f0
+SHA1 (patch-ai) = 95a69011734d150c43c0c73a55d2b367e0d17491
+SHA1 (patch-aj) = 914ba4a795b47a3bea0284ff36967fc505b01878
+SHA1 (patch-ak) = c4c667324b955f3b45995c99b317a1b97af18f0b
diff --git a/devel/oaf/patches/patch-ad b/devel/oaf/patches/patch-ad
index 362f6e67347..a4b007e8484 100644
--- a/devel/oaf/patches/patch-ad
+++ b/devel/oaf/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.3 2001/01/02 22:11:32 tron Exp $
+$NetBSD: patch-ad,v 1.4 2001/04/06 21:55:40 rh Exp $
 
---- oafd/main.c.orig	Tue Nov  7 01:19:45 2000
-+++ oafd/main.c	Tue Jan  2 23:02:40 2001
-@@ -26,7 +26,8 @@
- #include "config.h"
- #include "oaf-i18n.h"
- 
+--- oafd/main.c.orig	Wed Feb 21 10:50:43 2001
++++ oafd/main.c
+@@ -37,7 +37,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
 -#include <popt.h>
 +#include <locale.h>
 +#include <popt-gnome.h>
  #include <signal.h>
  #include <stdlib.h>
- 
+ #include <unistd.h>
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index 1fb2d35cca8..4379c6b8a3e 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2000/10/22 07:35:45 rh Exp $
+$NetBSD: patch-ag,v 1.4 2001/04/06 21:55:40 rh Exp $
 
---- configure.orig	Fri Oct 20 00:19:29 2000
+--- configure.orig	Fri Mar  2 04:16:10 2001
 +++ configure
-@@ -3556,7 +3556,7 @@
+@@ -3633,7 +3633,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -11,7 +11,36 @@ $NetBSD: patch-ag,v 1.3 2000/10/22 07:35:45 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5153,7 +5153,6 @@
+@@ -4744,8 +4744,8 @@
+ 
+ 
+ 
+-echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
+-echo "configure:4749: checking for poptGetContext in -lpopt" >&5
++echo $ac_n "checking for poptGetContext in -lgnomesupport""... $ac_c" 1>&6
++echo "configure:4749: checking for poptGetContext in -lgnomesupport" >&5
+ ac_lib_var=`echo popt'_'poptGetContext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4764,7 +4764,7 @@
+ poptGetContext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if true; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4785,7 +4785,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lpopt $LIBS"
++LIBS="$LIBS -lgnomesupport"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+@@ -5238,7 +5238,6 @@
  	-Wall \
  	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
  	-Wnested-externs -Wpointer-arith \
diff --git a/devel/oaf/patches/patch-aj b/devel/oaf/patches/patch-aj
index 121bc22d4fb..5b799ca884e 100644
--- a/devel/oaf/patches/patch-aj
+++ b/devel/oaf/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2000/08/29 16:26:21 rh Exp $
+$NetBSD: patch-aj,v 1.2 2001/04/06 21:55:40 rh Exp $
 
---- test/Makefile.in.orig	Tue Aug 29 17:15:25 2000
+--- test/Makefile.in.orig	Fri Mar  2 04:16:48 2001
 +++ test/Makefile.in
-@@ -489,7 +489,7 @@
+@@ -468,7 +468,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.
+ check:
+ 	OAF_INFO_PATH="$(top_srcdir)/test:$$OAF_INFO_PATH" PATH="$(top_builddir)/test:$$PATH" $(top_builddir)/test/oaf-test-client
diff --git a/devel/oaf/patches/patch-ak b/devel/oaf/patches/patch-ak
new file mode 100644
index 00000000000..bd61b5e0fcb
--- /dev/null
+++ b/devel/oaf/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2001/04/06 21:55:40 rh Exp $
+
+--- liboaf/oaf-mainloop.h.orig	Thu Apr  5 16:03:39 2001
++++ liboaf/oaf-mainloop.h
+@@ -26,7 +26,7 @@
+ #ifndef OAF_MAINLOOP_H
+ #define OAF_MAINLOOP_H
+ 
+-#include <popt.h>
++#include <popt-gnome.h>
+ 
+ CORBA_ORB      oaf_orb_init   (int   *argc, 
+ 			       char **argv);
diff --git a/devel/oaf/pkg/PLIST b/devel/oaf/pkg/PLIST
index 9c2e8e4d017..aa4b6398526 100644
--- a/devel/oaf/pkg/PLIST
+++ b/devel/oaf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:32 agc Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/04/06 21:55:40 rh Exp $
 bin/oafd
 bin/oaf-client
 bin/oaf-run-query
@@ -36,16 +36,21 @@ 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/no/LC_MESSAGES/oaf.mo
+share/locale/pl/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/tr/LC_MESSAGES/oaf.mo
 share/locale/uk/LC_MESSAGES/oaf.mo
-share/oaf/oafd.oafinfo
+share/oaf/OAF_naming-service.oaf
 share/oaf/empty.oafinfo
 @exec mkdir -p %D/share/oaf/html/liboaf
 @dirrm etc/oaf