[pkgsrc/trunk]: pkgsrc/emulators Enable HAL, bump PKGREVISION

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c1bb2b9e593
branches:  trunk
changeset: 551110:6c1bb2b9e593
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Dec 07 15:31:57 2008 +0000

description:
Enable HAL, bump PKGREVISION

diffstat:

 emulators/wine-devel/Makefile   |   3 ++-
 emulators/wine-devel/options.mk |  12 +++++++++---
 emulators/wine/Makefile         |   3 ++-
 emulators/wine/options.mk       |  12 +++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diffs (80 lines):

diff -r 50955936c677 -r 6c1bb2b9e593 emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Sun Dec 07 15:16:53 2008 +0000
+++ b/emulators/wine-devel/Makefile     Sun Dec 07 15:31:57 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/12/07 00:43:03 adam Exp $
+# $NetBSD: Makefile,v 1.4 2008/12/07 15:32:06 jmcneill Exp $
 
 DISTNAME=      wine-1.1.10
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
diff -r 50955936c677 -r 6c1bb2b9e593 emulators/wine-devel/options.mk
--- a/emulators/wine-devel/options.mk   Sun Dec 07 15:16:53 2008 +0000
+++ b/emulators/wine-devel/options.mk   Sun Dec 07 15:31:57 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/11/21 17:40:29 adam Exp $
+# $NetBSD: options.mk,v 1.2 2008/12/07 15:32:06 jmcneill Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap dbus ssl x11
-PKG_SUGGESTED_OPTIONS= opengl esound ldap dbus ssl x11
+PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap dbus hal ssl x11
+PKG_SUGGESTED_OPTIONS= opengl esound ldap dbus hal ssl x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -24,6 +24,12 @@
 CONFIGURE_ARGS+= --without-dbus
 .endif
 
+.if !empty(PKG_OPTIONS:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-hal
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 .else
diff -r 50955936c677 -r 6c1bb2b9e593 emulators/wine/Makefile
--- a/emulators/wine/Makefile   Sun Dec 07 15:16:53 2008 +0000
+++ b/emulators/wine/Makefile   Sun Dec 07 15:31:57 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.148 2008/10/18 11:55:27 adam Exp $
+# $NetBSD: Makefile,v 1.149 2008/12/07 15:31:57 jmcneill Exp $
 
 DISTNAME=      wine-1.0.1
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
diff -r 50955936c677 -r 6c1bb2b9e593 emulators/wine/options.mk
--- a/emulators/wine/options.mk Sun Dec 07 15:16:53 2008 +0000
+++ b/emulators/wine/options.mk Sun Dec 07 15:31:57 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.10 2008/06/23 16:57:08 dholland Exp $
+# $NetBSD: options.mk,v 1.11 2008/12/07 15:31:57 jmcneill Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap dbus ssl x11
-PKG_SUGGESTED_OPTIONS= opengl esound ldap dbus ssl x11
+PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap dbus hal ssl x11
+PKG_SUGGESTED_OPTIONS= opengl esound ldap dbus hal ssl x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -24,6 +24,12 @@
 CONFIGURE_ARGS+= --without-dbus
 .endif
 
+.if !empty(PKG_OPTIONS:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-hal
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 .else