#if 0 out the __weak_alias stuff, which isn't needed here. should fix

build on OpenBSD ELF platforms.

6 files changed, 23 insertions, 11 deletions

diff --git a/pkgtools/libnbcompat/files/__fts13.c b/pkgtools/libnbcompat/files/__fts13.c
index 7bba7587f4b..5c7971f5ce4 100644
--- a/pkgtools/libnbcompat/files/__fts13.c
+++ b/pkgtools/libnbcompat/files/__fts13.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __fts13.c,v 1.4 2003/09/03 13:11:13 jlam Exp $	*/
+/*	$NetBSD: __fts13.c,v 1.5 2004/03/12 15:21:13 grant Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #else
-__RCSID("$NetBSD: __fts13.c,v 1.4 2003/09/03 13:11:13 jlam Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.5 2004/03/12 15:21:13 grant Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -88,6 +88,7 @@ __RCSID("$NetBSD: __fts13.c,v 1.4 2003/09/03 13:11:13 jlam Exp $");
 #define HAVE_STRUCT_DIRENT_D_NAMLEN 1
 #endif
 
+#if 0
 #ifdef __weak_alias
 #ifdef __LIBC12_SOURCE__
 __weak_alias(fts_children,_fts_children)
@@ -97,6 +98,7 @@ __weak_alias(fts_read,_fts_read)
 __weak_alias(fts_set,_fts_set)
 #endif /* __LIBC12_SOURCE__ */
 #endif /* __weak_alias */
+#endif
 
 #ifdef __LIBC12_SOURCE__
 #define	STAT	stat12
diff --git a/pkgtools/libnbcompat/files/getopt_long.c b/pkgtools/libnbcompat/files/getopt_long.c
index c169d433f55..e1c0b73eb2f 100644
--- a/pkgtools/libnbcompat/files/getopt_long.c
+++ b/pkgtools/libnbcompat/files/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt_long.c,v 1.5 2003/09/06 04:28:16 grant Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.6 2004/03/12 15:21:13 grant Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getopt_long.c,v 1.5 2003/09/06 04:28:16 grant Exp $");
+__RCSID("$NetBSD: getopt_long.c,v 1.6 2004/03/12 15:21:13 grant Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 /* #include "namespace.h" */
@@ -74,10 +74,12 @@ __RCSID("$NetBSD: getopt_long.c,v 1.5 2003/09/06 04:28:16 grant Exp $");
 #ifndef __ELF__
 #define _getopt getopt
 #else
+#if 0
 #ifdef __weak_alias
 __weak_alias(getopt,_getopt)
 #endif
 #endif
+#endif
 int	opterr = 1;		/* if error message should be printed */
 int	optind = 1;		/* index into parent argv vector */
 int	optopt = '?';		/* character checked for validity */
diff --git a/pkgtools/libnbcompat/files/namespace.h b/pkgtools/libnbcompat/files/namespace.h
index 408f4f9ca02..3294caf6b20 100644
--- a/pkgtools/libnbcompat/files/namespace.h
+++ b/pkgtools/libnbcompat/files/namespace.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: namespace.h,v 1.3 2003/09/03 13:11:14 jlam Exp $	*/
+/*	$NetBSD: namespace.h,v 1.4 2004/03/12 15:21:13 grant Exp $	*/
 
 /*-
  * Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
 #include <sys/cdefs.h>
 #endif
 
+#if 0
 #define brk		_brk
 #define catclose	_catclose
 #define catgets		_catgets
@@ -622,5 +623,6 @@
 #define dladdr			__dladdr
 #define fmtcheck		__fmtcheck
 #endif /* __weak_alias */
+#endif
 
 #endif /* _NAMESPACE_H_ */
diff --git a/pkgtools/libnbcompat/files/pwcache.c b/pkgtools/libnbcompat/files/pwcache.c
index 42d7f2ad4c2..0d2dec162c9 100644
--- a/pkgtools/libnbcompat/files/pwcache.c
+++ b/pkgtools/libnbcompat/files/pwcache.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwcache.c,v 1.4 2003/09/03 13:11:14 jlam Exp $	*/
+/*	$NetBSD: pwcache.c,v 1.5 2004/03/12 15:21:13 grant Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -78,7 +78,7 @@
 #if 0
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pwcache.c,v 1.4 2003/09/03 13:11:14 jlam Exp $");
+__RCSID("$NetBSD: pwcache.c,v 1.5 2004/03/12 15:21:13 grant Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -93,6 +93,7 @@ __RCSID("$NetBSD: pwcache.c,v 1.4 2003/09/03 13:11:14 jlam Exp $");
 #include <string.h>
 #include <unistd.h>
 
+#if 0
 #ifndef __ELF__
 #define _user_from_uid	user_from_uid
 #define _group_from_gid	group_from_gid
@@ -106,6 +107,7 @@ __weak_alias(pwcache_userdb,_pwcache_userdb)
 __weak_alias(pwcache_groupdb,_pwcache_groupdb)
 #endif
 #endif
+#endif
 
 #include "pwcache.h"
 
diff --git a/pkgtools/libnbcompat/files/setmode.c b/pkgtools/libnbcompat/files/setmode.c
index c1ef791f884..c211f4d267e 100644
--- a/pkgtools/libnbcompat/files/setmode.c
+++ b/pkgtools/libnbcompat/files/setmode.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setmode.c,v 1.6 2003/09/05 22:19:30 jlam Exp $	*/
+/*	$NetBSD: setmode.c,v 1.7 2004/03/12 15:21:13 grant Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
 #else
-__RCSID("$NetBSD: setmode.c,v 1.6 2003/09/05 22:19:30 jlam Exp $");
+__RCSID("$NetBSD: setmode.c,v 1.7 2004/03/12 15:21:13 grant Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -71,6 +71,7 @@ __RCSID("$NetBSD: setmode.c,v 1.6 2003/09/05 22:19:30 jlam Exp $");
 #define _DIAGASSERT(cond)       assert(cond)
 #endif
 
+#if 0
 #ifndef __ELF__
 #define _getmode	getmode
 #define _setmode	setmode
@@ -80,6 +81,7 @@ __weak_alias(getmode,_getmode)
 __weak_alias(setmode,_setmode)
 #endif
 #endif
+#endif
 
 #define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
 #define	SET_LEN_INCR 4		/* # of bitcmd structs to add as needed */
diff --git a/pkgtools/libnbcompat/files/vis.c b/pkgtools/libnbcompat/files/vis.c
index 580ec2e97a6..b07045cc282 100644
--- a/pkgtools/libnbcompat/files/vis.c
+++ b/pkgtools/libnbcompat/files/vis.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.3 2003/09/03 13:11:16 jlam Exp $	*/
+/*	$NetBSD: vis.c,v 1.4 2004/03/12 15:21:13 grant Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.3 2003/09/03 13:11:16 jlam Exp $");
+__RCSID("$NetBSD: vis.c,v 1.4 2004/03/12 15:21:13 grant Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -58,6 +58,7 @@ __RCSID("$NetBSD: vis.c,v 1.3 2003/09/03 13:11:16 jlam Exp $");
 #include "nbcompat/vis.h"
 #include <stdlib.h>
 
+#if 0
 #ifndef __ELF__
 #define _strsvis	strsvis
 #define _strsvisx	strsvisx
@@ -75,6 +76,7 @@ __weak_alias(svis,_svis)
 __weak_alias(vis,_vis)
 #endif
 #endif
+#endif
 
 #include <ctype.h>
 #include <limits.h>