From b4d1a287821b1d5230821f487ba38565ccad826e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 9 Oct 2012 11:16:30 +0200
Subject: [PATCH] wine-unstable: rebuild against glu-9.0.

---
 .../wine-unstable/libwine-unstable.template   |  6 +--
 srcpkgs/wine-unstable/template                | 41 +++++++++----------
 .../wine-unstable-devel.template              |  9 ++--
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index 2ee780cf573..65725acf114 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -5,13 +5,11 @@ long_desc="${long_desc}
 
  This package contains the wine runtime."
 
-only_for_archs=i686
 replaces="libwine>=0"
-provides="libwine-$version"
+provides="libwine-${version}"
 conflicts="libwine>=0"
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 	vmove usr/lib/wine usr/lib
 }
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 8349c5876cd..43b90629894 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -2,27 +2,16 @@
 __pkgname=wine
 pkgname=${__pkgname}-unstable
 version=1.5.14
+revision=2
 wrksrc=${__pkgname}-${version}
 build_style=gnu-configure
 configure_args="--with-x"
-homepage="http://www.winehq.org/"
-distfiles="${SOURCEFORGE_SITE}/${__pkgname}/${__pkgname}-${version}.tar.bz2"
-depends="libwine-unstable"
-makedepends="flex gettext-devel autoconf lcms-devel zlib-devel ncurses-devel
-MesaLib-devel>=8.0.4_3 libSM-devel libXext-devel libX11-devel libXpm-devel
-libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
-libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel
-alsa-lib-devel libgphoto2-devel libxml2-devel libxslt-devel glib-devel
-gst-plugins-base-devel freetype-devel mpg123-devel libgsm-devel libopenal-devel
-giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel
-dbus-devel cups-devel sane-devel prelink"
-fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
-fontconfig libOSMesa"
-# libOSMesa is loaded with dlopen(3) at runtime
-revision=1
+depends="libwine-unstable-${version}_${revision}"
 short_desc="Run Windows apps on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
+homepage="http://www.winehq.org/"
+distfiles="${SOURCEFORGE_SITE}/${__pkgname}/${__pkgname}-${version}.tar.bz2"
 checksum=3e70ff0f900bf459dd6fa767bdac5543a27b76364f8ef89088300b867351df42
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
@@ -30,19 +19,27 @@ long_desc="
  Windows. (unstable)"
 
 only_for_archs=i686
-build_requires=11
 replaces="wine>=0"
-provides="wine-$version"
+provides="wine-${version}"
 conflicts="wine>=0"
-subpackages="lib$pkgname $pkgname-devel"
-
-
+subpackages="lib${pkgname} ${pkgname}-devel"
 
 # XXX OpenCL
 # XXX libcapi20 (ISDN support)
+makedepends="flex gettext-devel autoconf lcms-devel zlib-devel ncurses-devel
+ glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
+ libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
+ libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel
+ alsa-lib-devel libgphoto2-devel libxml2-devel libxslt-devel glib-devel
+ gst-plugins-base-devel freetype-devel mpg123-devel libgsm-devel libopenal-devel
+ giflib-devel libpng-devel v4l-utils-devel fontconfig-devel gnutls-devel
+ dbus-devel cups-devel sane-devel prelink"
 
-pre_configure()
-{
+# libOSMesa is loaded with dlopen(3) at runtime
+fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
+ fontconfig libOSMesa"
+
+pre_configure() {
 	autoreconf -fi
 	sed -i 's/\(libncurses\)/\1w/g' configure
 }
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 85e57d4e1f6..6bf1bd2d3b4 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -1,18 +1,15 @@
 # Template file for 'libwine-unstable'.
 #
-depends="glibc-devel libwine-unstable"
+depends="libwine-unstable-${version}_${revision}"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-only_for_archs=i686
 replaces="wine-devel>=0"
-provides="wine-devel-$version"
+provides="wine-devel-${version}"
 conflicts="wine-devel>=0"
 
-
-do_install()
-{
+do_install() {
         vmove usr/include usr
 }