Enable HAL support.

5 files changed, 50 insertions, 4 deletions

diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile
index 439ad3f1f47..9ef39816f52 100644
--- a/x11/xfce4-exo/Makefile
+++ b/x11/xfce4-exo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/07/18 14:20:56 obache Exp $
+# $NetBSD: Makefile,v 1.5 2008/12/09 10:33:36 ahoka Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,12 +8,14 @@ XFCE4_VERSION=	0.3.4
 
 DISTNAME=	exo-${XFCE4_VERSION}
 PKGNAME=	xfce4-exo-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Xfce extension library
 
 DEPENDS+=	p5-URI>=0:../../www/p5-URI
 
+.include "options.mk"
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk
index 41a59e53094..624b9d63c42 100644
--- a/x11/xfce4-exo/buildlink3.mk
+++ b/x11/xfce4-exo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/12/07 19:43:27 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/12/09 10:33:36 ahoka Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_EXO_BUILDLINK3_MK:=	${XFCE4_EXO_BUILDLINK3_MK}+
@@ -16,6 +16,13 @@ BUILDLINK_API_DEPENDS.xfce4-exo+=	xfce4-exo>=0.3.4
 BUILDLINK_PKGSRCDIR.xfce4-exo?=	../../x11/xfce4-exo
 .endif	# XFCE4_EXO_BUILDLINK3_MK
 
+pkgbase := xfce4-exo
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.xfce4-exo:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+.endif
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo
index 541b7b2f8e8..50b030d5984 100644
--- a/x11/xfce4-exo/distinfo
+++ b/x11/xfce4-exo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/07/01 13:41:07 obache Exp $
+$NetBSD: distinfo,v 1.5 2008/12/09 10:33:36 ahoka Exp $
 
 SHA1 (exo-0.3.4.tar.bz2) = 4f7a3f46592fd0311be1f011f17431f211cc1fcb
 RMD160 (exo-0.3.4.tar.bz2) = e021f030a624c522c819ec0f3a8682a1007ae748
 Size (exo-0.3.4.tar.bz2) = 1300127 bytes
 SHA1 (patch-ad) = af08127aad06a5e9d8e8055dff1f55982666d8d9
+SHA1 (patch-ae) = 18a95737a6eaef8697224d4c099625c18be7ddfb
diff --git a/x11/xfce4-exo/options.mk b/x11/xfce4-exo/options.mk
new file mode 100644
index 00000000000..8a44f30a8b7
--- /dev/null
+++ b/x11/xfce4-exo/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2008/12/09 10:33:36 ahoka Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xfce4-exo
+PKG_SUPPORTED_OPTIONS=	hal
+PKG_SUGGESTED_OPTIONS=	hal
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hal
+.else
+CONFIGURE_ARGS+=	--disable-hal
+.endif
diff --git a/x11/xfce4-exo/patches/patch-ae b/x11/xfce4-exo/patches/patch-ae
new file mode 100644
index 00000000000..835c9e72ac2
--- /dev/null
+++ b/x11/xfce4-exo/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2008/12/09 10:33:36 ahoka Exp $
+
+--- exo-mount/exo-mount-fstab.c.orig	2007-12-02 13:33:44.000000000 +0100
++++ exo-mount/exo-mount-fstab.c
+@@ -36,9 +36,15 @@
+ 
+ 
+ 
+-/* define _PATH_MOUNT if undefined */
++/* define _PATH_MOUNT if undefined
++ * TODO: My fix is even worse than the original, make it correct.
++ */
+ #ifndef _PATH_MOUNT
+-#define _PATH_MOUNT "/bin/mount"
++# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#  define _PATH_MOUNT "/sbin/mount"
++# else
++#  define _PATH_MOUNT "/bin/mount"
++# endif /* __NetBSD__ */
+ #endif
+ 
+