wine: update to 1.6 (replaces old wine-unstable pkg).

common/shlibs

@@ -865,7 +865,7 @@ libserd-0.so.0 libserd-0.18.0_1
 libsord-0.so.0 libsord-0.5.0_1
 libgiggle.so.0 libgiggle-0.6.1_1
 libgiggle-git.so.0 libgiggle-0.6.1_1
-libwine.so.1 libwine-1.4.1_1
+libwine.so.1 libwine-1.6_1
 libwv-1.2.so.3 libwv-1.2.4_1
 libabiword-2.8.so libabiword-2.8.6_1
 libmpg123.so.0 libmpg123-1.13.4_2_1

srcpkgs/wine/template

@@ -1,25 +1,23 @@
 # Template file for 'wine'
 pkgname=wine
-version=1.4.1
+version=1.6
-revision=2
+revision=1
 build_style=gnu-configure
-configure_args="--with-x"
+short_desc="Run Microsoft Windows applications"
-short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
 homepage="http://www.winehq.org/"
-distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856
+checksum=e1f130efbdcbfa211ca56ee03357ccd17a31443889b4feebdcb88248520b42ae
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
- you can install and run these applications just like you would in
+ you can install and run these applications just like you would in Windows."
- Windows."
 
 only_for_archs=i686
 
-# XXX OpenCL
+# XXX OpenCL support
-# XXX libcapi20 (ISDN support)
+hostmakedepends="pkg-config flex prelink"
-makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel
+makedepends="gettext-devel 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
@@ -27,7 +25,7 @@ makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-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 sane-devel
- cups-devel prelink"
+ cups-devel dbus-devel"
 
 makedepends+=" desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
 
@@ -37,27 +35,28 @@ pre_configure() {
 }
 
 libwine_package() {
-	short_desc="${short_desc} - Runtime library"
+	short_desc+=" - Runtime library"
-	replaces="libwine>=0"
+	replaces="libwine-unstable>=0"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 		vmove usr/lib/wine
 	}
 }
 
 wine-devel_package() {
 	depends="libwine-${version}_${revision}"
-	short_desc="${short_desc} - Development files"
+	short_desc+=" - development files"
 	replaces="wine-unstable-devel>=0"
-	conflicts="wine-unstable-devel>=0"
 	pkg_install() {
         	vmove usr/include
+		vmove "usr/lib/*.so"
 	}
 }
 
 wine_package() {
-	replaces="wine>=0"
+	depends="libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf"
+	replaces="wine-unstable>=0"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }