summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authoradam <adam>2005-10-17 14:09:12 +0000
committeradam <adam>2005-10-17 14:09:12 +0000
commit2f0fbe8a8bfba94532bd97da212fcd27bdd9277c (patch)
tree434f21ae9dd9146672279c551720d0c83074b837 /emulators
parentea7a505f14f1b005e6d2a458318e5f95f0d3a02d (diff)
downloadpkgsrc-2f0fbe8a8bfba94532bd97da212fcd27bdd9277c.tar.gz
Added options to use arts and sane
Diffstat (limited to 'emulators')
-rw-r--r--emulators/wine/Makefile7
-rw-r--r--emulators/wine/options.mk12
2 files changed, 12 insertions, 7 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index c55edf1b5e6..f0c3fa1b342 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2005/10/10 08:32:23 adam Exp $
+# $NetBSD: Makefile,v 1.92 2005/10/17 14:09:12 adam Exp $
DISTNAME= Wine-20050930
PKGNAME= ${DISTNAME:S/W/w/}
@@ -13,8 +13,6 @@ COMMENT= Free implementation of Windows on Unix (still alpha)
BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
-CONFLICTS= rewind-[0-9]*
-
ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
@@ -25,8 +23,6 @@ USE_TOOLS+= bison gmake mktemp
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --disable-trace
-CONFIGURE_ENV+= ac_cv_path_ARTSCCONFIG=${TRUE}
-CONFIGURE_ENV+= ac_cv_prog_sane_devel=no
UNLIMIT_RESOURCES= datasize
REPLACE_PERL= tools/winemaker tools/winedump/function_grep.pl
@@ -50,6 +46,7 @@ LIBS+= ${LDFLAGS}
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 6f5a34fc7db..90d56bfb671 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,10 +1,18 @@
-# $NetBSD: options.mk,v 1.1 2005/05/31 21:42:04 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/10/17 14:09:12 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS= cups
+PKG_SUPPORTED_OPTIONS= arts cups sane
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Marts)
+.include "../../audio/arts/buildlink3.mk"
+.endif
+
.if !empty(PKG_OPTIONS:Mcups)
.include "../../print/cups/buildlink3.mk"
.endif
+
+.if !empty(PKG_OPTIONS:Msane)
+.include "../../graphics/sane-backends/buildlink3.mk"
+.endif