10 files changed, 8 insertions, 143 deletions
diff --git a/devel/oaf/patches/patch-aa b/devel/oaf/patches/patch-aa
deleted file mode 100644
index f821bc065f2..00000000000
--- a/devel/oaf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/08/31 05:39:56 rh Exp $
-
---- oafd/Makefile.in.orig	Tue Aug 29 17:05:15 2000
-+++ oafd/Makefile.in
-@@ -248,7 +248,7 @@
- 
- oafd: $(oafd_OBJECTS) $(oafd_DEPENDENCIES)
- 	@rm -f oafd
--	$(LINK) $(oafd_LDFLAGS) $(oafd_OBJECTS) $(oafd_LDADD) $(LIBS)
-+	$(LINK) $(oafd_LDFLAGS) $(oafd_OBJECTS) $(oafd_LDADD) $(LIBS) ${INTLLIBS}
- 
- oaf-client: $(oaf_client_OBJECTS) $(oaf_client_DEPENDENCIES)
- 	@rm -f oaf-client
diff --git a/devel/oaf/patches/patch-ab b/devel/oaf/patches/patch-ab
deleted file mode 100644
index b7f2d5986ff..00000000000
--- a/devel/oaf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
-
---- liboaf/oaf-mainloop.c.orig	Wed May 31 14:14:53 2000
-+++ liboaf/oaf-mainloop.c	Sun Jul 16 20:33:37 2000
-@@ -15,7 +15,7 @@
- #include <stdlib.h>
- 
- #include <glib.h>
--#include <popt.h>
-+#include <popt-gnome.h>
- 
- /****************** ORBit-specific stuff ****************/
- 
diff --git a/devel/oaf/patches/patch-ad b/devel/oaf/patches/patch-ad
index a4b007e8484..c4838e254ce 100644
--- a/devel/oaf/patches/patch-ad
+++ b/devel/oaf/patches/patch-ad
@@ -1,14 +1,12 @@
-$NetBSD: patch-ad,v 1.4 2001/04/06 21:55:40 rh Exp $
+$NetBSD: patch-ad,v 1.5 2001/10/01 11:01:03 rh Exp $
 
---- oafd/main.c.orig	Wed Feb 21 10:50:43 2001
+--- oafd/main.c.orig	Tue Jul 24 00:50:25 2001
 +++ oafd/main.c
-@@ -37,7 +37,8 @@
+@@ -37,6 +37,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
--#include <popt.h>
 +#include <locale.h>
-+#include <popt-gnome.h>
+ #include <popt.h>
  #include <signal.h>
  #include <stdlib.h>
- #include <unistd.h>
diff --git a/devel/oaf/patches/patch-ae b/devel/oaf/patches/patch-ae
deleted file mode 100644
index 329902cc652..00000000000
--- a/devel/oaf/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
-
---- oafd/client.c.orig	Tue May 30 12:29:28 2000
-+++ oafd/client.c	Sun Jul 16 20:33:37 2000
-@@ -4,7 +4,7 @@
- #include "liboaf/liboaf-private.h"
- #include "oafd.h"
- #include <stdio.h>
--#include <popt.h>
-+#include <popt-gnome.h>
- 
- static char *acior = NULL, *specs = NULL;
- static int do_query;
diff --git a/devel/oaf/patches/patch-af b/devel/oaf/patches/patch-af
deleted file mode 100644
index a4cecd38288..00000000000
--- a/devel/oaf/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/07/16 19:44:18 rh Exp $
-
---- test/empty-server.c.orig	Tue May 30 12:29:28 2000
-+++ test/empty-server.c	Sun Jul 16 20:33:37 2000
-@@ -4,7 +4,7 @@
- #include <string.h>
- #include <signal.h>
- #include <orb/orbit.h>
--#include <popt.h>
-+#include <popt-gnome.h>
- #include "empty.h"
- #include "liboaf/liboaf.h"
- 
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index 4379c6b8a3e..f676c699cac 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2001/04/06 21:55:40 rh Exp $
+$NetBSD: patch-ag,v 1.5 2001/10/01 11:01:04 rh Exp $
 
---- configure.orig	Fri Mar  2 04:16:10 2001
+--- configure.orig	Tue Aug 21 07:45:23 2001
 +++ configure
-@@ -3633,7 +3633,7 @@
+@@ -7215,7 +7215,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -11,36 +11,7 @@ $NetBSD: patch-ag,v 1.4 2001/04/06 21:55:40 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -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 @@
+@@ -8825,7 +8825,6 @@
  	-Wall \
  	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
  	-Wnested-externs -Wpointer-arith \
diff --git a/devel/oaf/patches/patch-ah b/devel/oaf/patches/patch-ah
deleted file mode 100644
index afeef056ff0..00000000000
--- a/devel/oaf/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 401b1b3faf3..00000000000
--- a/devel/oaf/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 5b799ca884e..00000000000
--- a/devel/oaf/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2001/04/06 21:55:40 rh Exp $
-
---- test/Makefile.in.orig	Fri Mar  2 04:16:48 2001
-+++ test/Makefile.in
-@@ -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 > $@
- 
- 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
deleted file mode 100644
index bd61b5e0fcb..00000000000
--- a/devel/oaf/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);