5 files changed, 34 insertions, 13 deletions
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 01578d93911..4c62df4cc7d 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/04/14 20:53:08 adam Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/18 17:11:08 jmmv Exp $
 #
 
 DISTNAME=		fam-2.7.0
+PKGREVISION=		1
 CATEGORIES=		sysutils devel
 MASTER_SITES=		ftp://oss.sgi.com/projects/fam/download/stable/	\
 			ftp://ftp.tuwien.ac.at/opsys/linux/gentoo/distfiles/ \
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index 00c443de574..ad76d55c57f 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2004/04/14 20:53:08 adam Exp $
+$NetBSD: distinfo,v 1.12 2004/04/18 17:11:08 jmmv Exp $
 
 SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
 Size (fam-2.7.0.tar.gz) = 301974 bytes
-SHA1 (patch-aa) = 6ddb9ca9fd88de66a8edc3e2bc60b15b47c7b853
+SHA1 (patch-aa) = 19743b7627e72e96c13a1288d8872e85d42a6dca
 SHA1 (patch-ab) = a486fd2b7330a0942717fd2aebb0fbdeb3c87dc7
 SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863
 SHA1 (patch-ad) = b8e621acd36811a76a84af82e6f2b5962973e344
@@ -11,9 +11,9 @@ SHA1 (patch-af) = 57946b3837479b641bb002620ae41008f49af995
 SHA1 (patch-ag) = fa5889ad6d93af72d7efe83784caf61b2ac39d6a
 SHA1 (patch-ah) = d7763198df76d1f0783342a8961b59879e8e1241
 SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5
-SHA1 (patch-aj) = 7aa752e629ad32925ec58cbe1532e8c9bd454a24
+SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa
 SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1
 SHA1 (patch-ao) = 64827309bf91a2018629e28fef20109dde3fbf01
 SHA1 (patch-ap) = 256910675fad9922c0bca47c5b080eb96b51fe1d
 SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b
-SHA1 (patch-ax) = 7bb6bd577377c22138d887e1568328a231f04c57
+SHA1 (patch-ax) = 950e9fd9de885f653f96aebaafc2269f489e2fad
diff --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa
index 46956a71914..665ba0b061f 100644
--- a/sysutils/fam/patches/patch-aa
+++ b/sysutils/fam/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2004/03/29 15:39:11 minskim Exp $
+$NetBSD: patch-aa,v 1.6 2004/04/18 17:11:08 jmmv Exp $
 
---- configure.ac.orig	2003-11-26 13:47:59.000000000 -0600
+--- configure.ac.orig	2003-11-26 20:47:59.000000000 +0100
 +++ configure.ac
 @@ -31,7 +31,7 @@ AC_CHECK_LIB([rpcsvc], [pmap_set])
  # Checks for header files.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2004/03/29 15:39:11 minskim Exp $
  
  if test "$have_sys_imon_h"; then
  	MONITOR_FUNCS=IMonIRIX
-@@ -51,7 +51,9 @@ AC_C_INLINE
+@@ -51,12 +51,14 @@ AC_C_INLINE
  AC_TYPE_PID_T
  AC_TYPE_SIZE_T
  AC_HEADER_TIME
@@ -22,3 +22,9 @@ $NetBSD: patch-aa,v 1.5 2004/03/29 15:39:11 minskim Exp $
  
  # Checks for library functions.
  AC_FUNC_ERROR_AT_LINE
+ AC_FUNC_SELECT_ARGTYPES
+-AC_CHECK_FUNCS([bindresvport _daemonize daemon getgrmember select])
++AC_CHECK_FUNCS([bindresvport _daemonize daemon getgrmember select unsetenv])
+ 
+ AC_CONFIG_FILES([Makefile
+                  src/Makefile
diff --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj
index b85187f830f..439d57274ed 100644
--- a/sysutils/fam/patches/patch-aj
+++ b/sysutils/fam/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.5 2004/03/28 22:00:05 minskim Exp $
+$NetBSD: patch-aj,v 1.6 2004/04/18 17:11:08 jmmv Exp $
 
---- src/Listener.c++.orig	2003-01-19 18:37:29.000000000 -0600
+--- src/Listener.c++.orig	2003-01-20 01:37:29.000000000 +0100
 +++ src/Listener.c++
 @@ -22,6 +22,8 @@
  
@@ -19,7 +19,12 @@ $NetBSD: patch-aj,v 1.5 2004/03/28 22:00:05 minskim Exp $
  #include <sys/stat.h>
  #include <sys/un.h>
  #include <unistd.h>
-@@ -209,7 +212,7 @@ Listener::create_local_client(TCP_Client
+@@ -205,11 +208,11 @@ Listener::create_local_client(TCP_Client
+ #ifdef HAVE_UNSETENV
+     unsetenv("TMPDIR");
+ #else
+-    putenv("TMPDIR=");
++    putenv("TMPDIR=/tmp");
  #endif
  
      char *tmpfile = tempnam("/tmp", ".fam");
diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax
index 02f83786428..c16ef8a23f2 100644
--- a/sysutils/fam/patches/patch-ax
+++ b/sysutils/fam/patches/patch-ax
@@ -1,6 +1,6 @@
-$NetBSD: patch-ax,v 1.7 2004/03/29 15:39:11 minskim Exp $
+$NetBSD: patch-ax,v 1.8 2004/04/18 17:11:08 jmmv Exp $
 
---- configure.orig	2003-11-26 13:47:26.000000000 -0600
+--- configure.orig	2003-11-26 20:47:26.000000000 +0100
 +++ configure
 @@ -1,6 +1,6 @@
  #! /bin/sh
@@ -155,6 +155,15 @@ $NetBSD: patch-ax,v 1.7 2004/03/29 15:39:11 minskim Exp $
  fi
  
  
+@@ -10193,7 +10293,7 @@ rm -f conftest*
+ 
+ 
+ 
+-for ac_func in bindresvport _daemonize daemon getgrmember select
++for ac_func in bindresvport _daemonize daemon getgrmember select unsetenv
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
 @@ -10646,7 +10746,7 @@ _ASBOX
  } >&5
  cat >&5 <<_CSEOF