Use initgroups(3) only when it is available.

5 files changed, 42 insertions, 12 deletions

diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index d13f465ed31..5da60c6a94a 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/10/16 21:47:37 minskim Exp $
+$NetBSD: distinfo,v 1.6 2004/10/21 07:39:43 minskim Exp $
 
 SHA1 (xterm-196/xterm.tar.gz) = 7e1493d2578cb8d1d6038108e48aad44f40e2a61
 Size (xterm-196/xterm.tar.gz) = 678177 bytes
-SHA1 (patch-aa) = 4d8b73c8f7c6720c677dd22c8bf91a7c3cc7ce5b
-SHA1 (patch-ab) = bce28bf5035f542f1f352cda77bbab90d1aa3705
-SHA1 (patch-ac) = d5352d7b3cd08f1529f3eead38e139ffcd0a21af
-SHA1 (patch-ad) = 1270428c21da4206a6cbd5e0384bfc5f4797acfc
+SHA1 (patch-aa) = f4f624ba6fc9a3f7ac1641a093131f638ea52451
+SHA1 (patch-ab) = 34a4c95c2d90f38639cee856f202bcc86228e71b
+SHA1 (patch-ac) = d215ee65851b4b7b33211fad9b6d821d701a1fa8
+SHA1 (patch-ad) = fff3bc2b92d64eb242e025af5e47e7c8cac3b6f8
diff --git a/x11/xterm/patches/patch-aa b/x11/xterm/patches/patch-aa
index 567cc42f2aa..8a7467f1d61 100644
--- a/x11/xterm/patches/patch-aa
+++ b/x11/xterm/patches/patch-aa
@@ -1,8 +1,14 @@
-$NetBSD: patch-aa,v 1.1 2004/10/16 18:19:54 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2004/10/21 07:39:43 minskim Exp $
 
 --- configure.in.orig	Sun Aug 15 16:07:59 2004
 +++ configure.in
-@@ -81,6 +81,7 @@ AC_CHECK_FUNCS( \
+@@ -76,11 +76,13 @@ AC_CHECK_FUNCS( \
+ 	bcopy \
+ 	gethostname \
+ 	getlogin \
++	initgroups \
+ 	memmove \
+ 	strerror \
  	strftime \
  	tcgetattr \
  	waitpid \
diff --git a/x11/xterm/patches/patch-ab b/x11/xterm/patches/patch-ab
index 3e90f236f29..316c460a85d 100644
--- a/x11/xterm/patches/patch-ab
+++ b/x11/xterm/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2004/10/16 18:19:54 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2004/10/21 07:39:43 minskim Exp $
 
 --- xtermcfg.hin.orig	Tue May 25 20:19:55 2004
 +++ xtermcfg.hin
-@@ -51,6 +51,7 @@ OR IN CONNECTION WITH THE USE OR PERFORM
+@@ -43,6 +43,7 @@ OR IN CONNECTION WITH THE USE OR PERFORM
+ #undef DFT_TERMTYPE		/* AC_ARG_WITH(default-term-type) */
+ #undef HAVE_GETHOSTNAME		/* AC_CHECK_FUNCS(gethostname) */
+ #undef HAVE_GETLOGIN		/* AC_CHECK_FUNCS(getlogin) */
++#undef HAVE_INITGROUPS		/* AC_CHECK_FUNCS(initgroups) */
+ #undef HAVE_LANGINFO_CODESET	/* AM_LANGINFO_CODESET */
+ #undef HAVE_LASTLOG_H		/* CF_LASTLOG */
+ #undef HAVE_LIB_NEXTAW		/* CF_X_ATHENA(--with-neXtaw) */
+@@ -51,6 +52,7 @@ OR IN CONNECTION WITH THE USE OR PERFORM
  #undef HAVE_LIB_XAWPLUS		/* CF_X_ATHENA(--with-XawPlus) */
  #undef HAVE_NCURSES_TERM_H	/* AC_CHECK_HEADERS(ncurses/term.h) */
  #undef HAVE_PATHS_H		/* CF_LASTLOG */
diff --git a/x11/xterm/patches/patch-ac b/x11/xterm/patches/patch-ac
index dba154f4e90..fd3d51fb1f2 100644
--- a/x11/xterm/patches/patch-ac
+++ b/x11/xterm/patches/patch-ac
@@ -1,8 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2004/10/16 18:19:54 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2004/10/21 07:39:43 minskim Exp $
 
 --- configure.orig	Sun Aug 15 15:35:57 2004
 +++ configure
-@@ -1492,6 +1492,7 @@ for ac_func in \
+@@ -1487,11 +1487,13 @@ for ac_func in \
+ 	bcopy \
+ 	gethostname \
+ 	getlogin \
++	initgroups \
+ 	memmove \
+ 	strerror \
  	strftime \
  	tcgetattr \
  	waitpid \
diff --git a/x11/xterm/patches/patch-ad b/x11/xterm/patches/patch-ad
index 70985cc411f..24ce0bd80c2 100644
--- a/x11/xterm/patches/patch-ad
+++ b/x11/xterm/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2004/10/16 21:47:37 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2004/10/21 07:39:43 minskim Exp $
 
 --- main.c.orig	Sun Aug 15 16:07:59 2004
 +++ main.c
@@ -13,3 +13,13 @@ $NetBSD: patch-ad,v 1.1 2004/10/16 21:47:37 minskim Exp $
  #ifndef linux
  #ifndef VMS
  #ifndef USE_POSIX_TERMIOS
+@@ -295,7 +299,9 @@ ttyslot()
+ #else
+ #include <sys/resource.h>
+ #endif
++#ifdef HAVE_INITGROUPS
+ #define HAS_BSD_GROUPS
++#endif
+ #endif /* !VMS */
+ #endif /* !linux */
+