-# I have a spell for this locally but need to test it first
-#optional_depends synthesistoolkit \
-# "-DWANT_STK=1" \
-# "-DWANT_STK=0" \
-# "for Stk (Synthesis Toolkit) support"
-
-
diff --git a/audio-creation/lmms/HISTORY b/audio-creation/lmms/HISTORY
index 4c24c51..90c9907 100644
--- a/audio-creation/lmms/HISTORY
+++ b/audio-creation/lmms/HISTORY
@@ -1,3 +1,7 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added, install in lib instead of lib64
+ * DEPENDS: overhauled
+
2009-01-09 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: switched to qt4_cmake_build to actually build
diff --git a/utils/usbutils/PROVIDES b/utils/usbutils/PROVIDES
new file mode 100755
index 0000000..65f0ea5
--- /dev/null
+++ b/utils/usbutils/PROVIDES
@@ -0,0 +1 @@
+USBIDS
diff --git a/utils/xen-tools/HISTORY b/utils/xen-tools/HISTORY
index 2ed5776..958c181 100644
--- a/utils/xen-tools/HISTORY
+++ b/utils/xen-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-07-31 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added, install into lib instead of lib64
+
2009-07-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.0
diff --git a/utils/xen-tools/PRE_BUILD b/utils/xen-tools/PRE_BUILD
new file mode 100755
index 0000000..ec51a92
--- /dev/null
+++ b/utils/xen-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/lib64/lib/' config/StdGNU.mk
diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index 8124c38..747ce63 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -9,6 +9,8 @@ if grep -q "\-O3" <<< $CFLAGS; then
CXXFLAGS="-fno-guess-branch-probability $CXXFLAGS"
fi &&
+OPTS="${OPTS} ${WINE64}" &&
+
default_build &&
if is_depends_enabled $SPELL docbook-utils; then
diff --git a/x11-libs/wine/CONFIGURE b/x11-libs/wine/CONFIGURE
new file mode 100755
index 0000000..a881b15
--- /dev/null
+++ b/x11-libs/wine/CONFIGURE
@@ -0,0 +1,8 @@
+ARCH="$(uname -m)" &&
+if [[ "${ARCH}" = 'x86_64' ]]; then
+ message "Wine64 does NOT run 32bit apps. You can, however, build a 64bit
Wine." &&
+ message "Probably this is not what you want. If you say 'n' to the next
question" &&
+ message "an attempt will be made to build a 32bit Wine, which will fail if
you" &&
+ message "do not have a multilib system." &&
+ config_query_option WINE64 'Build a 64bit Wine?' n '--enable-win64
--enable-maintainer-mode' ''
+fi
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index c90a0af..f5809bc 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -71,9 +71,9 @@ optional_depends libpng \
'--without-png' \
'for PNG image support' &&
-optional_depends libxslt \
- '--with-xslt' \
- '--without-xslt' \
+optional_depends libxslt \
+ '--with-xslt --with-xml' \
+ '--without-xslt --without-xml' \
'for a functional Microsoft XML (MSXML) implementation' &&
optional_depends MSTTF \
@@ -88,10 +88,11 @@ optional_depends nas \
'for NAS audio support' &&
optional_depends OPENGL \
'--with-opengl' \
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index d01d62e..727727c 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2009-08-01 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,CONFIGURE: added wine64 (fixes bug #11336)
+ * DEPENDS: completed optional dep on libxslt and commented out the
+ optional dep on ncurses as that fails to find libncurses and would
+ break the spell.
+
2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.26
[SM-Commit] GIT changes to master grimoire by Arjan Bouter (15506458953d993406f053f5e940358b853b4c21),
Arjan Bouter, 08/01/2009