summaryrefslogtreecommitdiff
path: root/sysutils/fam
diff options
context:
space:
mode:
authorminskim <minskim>2004-03-29 15:39:11 +0000
committerminskim <minskim>2004-03-29 15:39:11 +0000
commite9337e9258805ef6edf267009fc96dc0e9a309c8 (patch)
tree85fc6a6f029fd3e2cf064af17444ddfe8c067793 /sysutils/fam
parent42d9cd1f6084f222233b3e5451f4d03b6d2fc257 (diff)
downloadpkgsrc-e9337e9258805ef6edf267009fc96dc0e9a309c8.tar.gz
Patch configure.ac and regenerate the patch for configure instead of
patching configure directly, because this package already has a patch for configure.ac.
Diffstat (limited to 'sysutils/fam')
-rw-r--r--sysutils/fam/distinfo6
-rw-r--r--sysutils/fam/patches/patch-aa7
-rw-r--r--sysutils/fam/patches/patch-ax7
3 files changed, 11 insertions, 9 deletions
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index bb867b041d9..e5919b07f6f 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2004/03/29 15:12:57 tron Exp $
+$NetBSD: distinfo,v 1.10 2004/03/29 15:39:11 minskim Exp $
SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
Size (fam-2.7.0.tar.gz) = 301974 bytes
-SHA1 (patch-aa) = 22f1abd11e8367e0c1d0c146e4d8c14dc249a189
+SHA1 (patch-aa) = 6ddb9ca9fd88de66a8edc3e2bc60b15b47c7b853
SHA1 (patch-ab) = a486fd2b7330a0942717fd2aebb0fbdeb3c87dc7
SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863
SHA1 (patch-ad) = b8e621acd36811a76a84af82e6f2b5962973e344
@@ -15,4 +15,4 @@ SHA1 (patch-aj) = 7aa752e629ad32925ec58cbe1532e8c9bd454a24
SHA1 (patch-ao) = 64827309bf91a2018629e28fef20109dde3fbf01
SHA1 (patch-ap) = b8084876217ca0b8510175ca753a6bbe9378438e
SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b
-SHA1 (patch-ax) = fe82b245825aaa2a0add5329bca69d20accc4105
+SHA1 (patch-ax) = 7bb6bd577377c22138d887e1568328a231f04c57
diff --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa
index cfaa7ba4378..46956a71914 100644
--- a/sysutils/fam/patches/patch-aa
+++ b/sysutils/fam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2004/03/28 22:01:54 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2004/03/29 15:39:11 minskim Exp $
--- configure.ac.orig 2003-11-26 13:47:59.000000000 -0600
+++ configure.ac
@@ -11,13 +11,14 @@ $NetBSD: patch-aa,v 1.4 2004/03/28 22:01:54 minskim Exp $
if test "$have_sys_imon_h"; then
MONITOR_FUNCS=IMonIRIX
-@@ -51,7 +51,8 @@ AC_C_INLINE
+@@ -51,7 +51,9 @@ AC_C_INLINE
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_HEADER_TIME
-AC_CHECK_MEMBERS(struct sockaddr.sa_len, struct sockaddr_un.sun_len)
+AC_CHECK_MEMBERS(struct sockaddr.sa_len,,,[#include <sys/socket.h>])
-+AC_CHECK_MEMBERS(struct sockaddr_un.sun_len,,,[#include <sys/un.h>])
++AC_CHECK_MEMBERS(struct sockaddr_un.sun_len,,,[#include <sys/types.h>
++#include <sys/un.h>])
# Checks for library functions.
AC_FUNC_ERROR_AT_LINE
diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax
index 2d6db7d2033..02f83786428 100644
--- a/sysutils/fam/patches/patch-ax
+++ b/sysutils/fam/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.6 2004/03/29 15:12:57 tron Exp $
+$NetBSD: patch-ax,v 1.7 2004/03/29 15:39:11 minskim Exp $
--- configure.orig 2003-11-26 13:47:26.000000000 -0600
+++ configure
@@ -50,7 +50,7 @@ $NetBSD: patch-ax,v 1.6 2004/03/29 15:12:57 tron Exp $
int
main ()
{
-@@ -9910,7 +9914,102 @@ cat >>confdefs.h <<_ACEOF
+@@ -9910,7 +9914,103 @@ cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
_ACEOF
@@ -70,6 +70,7 @@ $NetBSD: patch-ax,v 1.6 2004/03/29 15:12:57 tron Exp $
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
++#include <sys/types.h>
+#include <sys/un.h>
+
+int
@@ -154,7 +155,7 @@ $NetBSD: patch-ax,v 1.6 2004/03/29 15:12:57 tron Exp $
fi
-@@ -10646,7 +10744,7 @@ _ASBOX
+@@ -10646,7 +10746,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF