summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emulators/wine-devel/Makefile3
-rw-r--r--emulators/wine-devel/options.mk12
-rw-r--r--emulators/wine/Makefile3
-rw-r--r--emulators/wine/options.mk12
4 files changed, 22 insertions, 8 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index a97a761891e..b2ccb5d66e7 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -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 --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk
index 6abcb979e7b..8f834e21292 100644
--- a/emulators/wine-devel/options.mk
+++ b/emulators/wine-devel/options.mk
@@ -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-ldap
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 --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index feb4d773d73..6ed9aeb4a70 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -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 --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index e153e6a501d..9841452b1dc 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -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-ldap
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