[pkgsrc/trunk]: pkgsrc/x11/xfce4-exo Enable HAL support.

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21c8585ddb4f
branches:  trunk
changeset: 551170:21c8585ddb4f
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Tue Dec 09 10:33:36 2008 +0000

description:
Enable HAL support.

diffstat:

 x11/xfce4-exo/Makefile         |   6 ++++--
 x11/xfce4-exo/buildlink3.mk    |   9 ++++++++-
 x11/xfce4-exo/distinfo         |   3 ++-
 x11/xfce4-exo/options.mk       |  14 ++++++++++++++
 x11/xfce4-exo/patches/patch-ae |  22 ++++++++++++++++++++++
 5 files changed, 50 insertions(+), 4 deletions(-)

diffs (104 lines):

diff -r a332daa97590 -r 21c8585ddb4f x11/xfce4-exo/Makefile
--- a/x11/xfce4-exo/Makefile    Tue Dec 09 10:32:26 2008 +0000
+++ b/x11/xfce4-exo/Makefile    Tue Dec 09 10:33:36 2008 +0000
@@ -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 @@
 
 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 -r a332daa97590 -r 21c8585ddb4f x11/xfce4-exo/buildlink3.mk
--- a/x11/xfce4-exo/buildlink3.mk       Tue Dec 09 10:32:26 2008 +0000
+++ b/x11/xfce4-exo/buildlink3.mk       Tue Dec 09 10:33:36 2008 +0000
@@ -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_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 -r a332daa97590 -r 21c8585ddb4f x11/xfce4-exo/distinfo
--- a/x11/xfce4-exo/distinfo    Tue Dec 09 10:32:26 2008 +0000
+++ b/x11/xfce4-exo/distinfo    Tue Dec 09 10:33:36 2008 +0000
@@ -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 -r a332daa97590 -r 21c8585ddb4f x11/xfce4-exo/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-exo/options.mk  Tue Dec 09 10:33:36 2008 +0000
@@ -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 -r a332daa97590 -r 21c8585ddb4f x11/xfce4-exo/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-exo/patches/patch-ae    Tue Dec 09 10:33:36 2008 +0000
@@ -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
+ 
+