PR# pkg/40146: security/policykit fails to build on Linux

4 files changed, 56 insertions, 3 deletions

diff --git a/security/policykit/Makefile b/security/policykit/Makefile
index a514e372698..cc0b3494bd0 100644
--- a/security/policykit/Makefile
+++ b/security/policykit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/12/20 19:44:00 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2008/12/21 13:57:29 jmcneill Exp $
 #
 
 POLICYKIT_VER=		0.9
@@ -30,9 +30,11 @@ BUILD_DEFS+=		PKG_SYSCONFBASE
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.4
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
+USE_TOOLS+=		gmake intltool msgfmt perl pkg-config autoconf
 USE_LIBTOOL=		YES
 
+AUTOCONF_REQD=		2.59
+
 POLICYKIT_USER?=	polkit
 POLICYKIT_GROUP?=	polkit
 PKG_GROUPS=		${POLICYKIT_GROUP}
@@ -56,6 +58,9 @@ post-install:
 BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
 .endif
 
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
diff --git a/security/policykit/distinfo b/security/policykit/distinfo
index a8a0c0baf95..59a0aec71fe 100644
--- a/security/policykit/distinfo
+++ b/security/policykit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/12/20 19:44:00 jmcneill Exp $
+$NetBSD: distinfo,v 1.6 2008/12/21 13:57:29 jmcneill Exp $
 
 SHA1 (PolicyKit-0.9.tar.gz) = ac99c580eff72f6d5df261c155fb047306439f85
 RMD160 (PolicyKit-0.9.tar.gz) = 197262d1c48e55558dd4bd57d7bbd8734666129c
@@ -15,4 +15,6 @@ SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
 SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f
 SHA1 (patch-ak) = d31933a6bb836311837c62a2fcf43b105d5464cf
 SHA1 (patch-al) = cd87d1c39bb38c70b8fa3170e90c641cc0029dc3
+SHA1 (patch-am) = e04337c969f14a8ef223888ef09f55087629684a
+SHA1 (patch-an) = b0c9b5a2905f8de4c428e4910914fb92fc906cfd
 SHA1 (patch-authdb) = 449b8ac50f81cc0234e17e64bc9892ade7119028
diff --git a/security/policykit/patches/patch-am b/security/policykit/patches/patch-am
new file mode 100644
index 00000000000..3f43f728911
--- /dev/null
+++ b/security/policykit/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2008/12/21 13:57:29 jmcneill Exp $
+
+PR# pkg/40146: security/policykit fails to build on Linux
+
+--- configure.in.orig	2008-06-30 22:40:59.000000000 +0300
++++ configure.in
+@@ -528,7 +528,7 @@ case "$host_os" in
+ esac
+ 
+ have_inotify=no
+-AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes])
++#AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes])
+ AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes])
+ 
+ AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes")
diff --git a/security/policykit/patches/patch-an b/security/policykit/patches/patch-an
new file mode 100644
index 00000000000..9a14d0d8df5
--- /dev/null
+++ b/security/policykit/patches/patch-an
@@ -0,0 +1,31 @@
+$NetBSD: patch-an,v 1.1 2008/12/21 13:57:29 jmcneill Exp $
+
+PR# pkg/40146: security/policykit fails to build on Linux
+
+--- src/polkit/polkit-context.c.orig	2008-05-31 00:24:44.000000000 +0300
++++ src/polkit/polkit-context.c
+@@ -310,6 +310,7 @@ polkit_context_init (PolKitContext *pk_c
+ 	}
+ #else
+         if (pk_context->io_add_watch_func != NULL) {
++#ifdef HAVE_INOTIFY
+                 pk_context->inotify_fd = inotify_init ();
+                 if (pk_context->inotify_fd < 0) {
+                         polkit_debug ("failed to initialize inotify: %s", strerror (errno));
+@@ -358,6 +359,7 @@ polkit_context_init (PolKitContext *pk_c
+                         /* TODO: set error */
+                         goto error;
+                 }
++#endif
+         }
+ #endif
+ 
+@@ -571,7 +573,7 @@ polkit_context_io_func (PolKitContext *p
+ 			polkit_debug ("failed to read kqueue event: %s", strerror (errno));
+ 		}
+ 	}
+-#else
++#elif HAVE_INOTIFY
+         if (fd == pk_context->inotify_fd) {
+ /* size of the event structure, not counting name */
+ #define EVENT_SIZE  (sizeof (struct inotify_event))