wine fix and version bump

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2204 370017ae-e619-0410-ac65-c121f96126d4

3 files changed, 16 insertions, 8 deletions

diff --git a/app/emulation/wine/Manifest b/app/emulation/wine/Manifest
index 6bdee778..99f9da85 100644
--- a/app/emulation/wine/Manifest
+++ b/app/emulation/wine/Manifest
@@ -1,5 +1,7 @@
 DIST wine-1.0.1.tar.bz2 13956805 MD5 b49540f4ed194c7e8da4cdc4b5bd3404 RMD160 fecd2bf970c51c80fc02ca39631034f066da145e SHA1 0550b03bf7b314514a87b6abb2198da96ef83b22 SHA256 c04bb376c6a2bd2be3bd8d5b73aa6db2dda3960791ea5d36579499fe72903479 SHA512 71ece5e13dec3c174a024b28eac802ab076207ce0b4c00b47998af167469c4d28571a02a5e2de23bd0a6f1a2c51875d15455aaa7c1140bd086068e0ae232d3a0
 DIST wine-1.1.15.tar.bz2 15057931 MD5 475cbf9a683259eca3e61b20ea2d86e2 RMD160 5203e46e498ae064a07d5ebe83fcb5ded3bc422d SHA1 99267058cf14d52b55c360d6e3af337d81695974 SHA256 ef96f6fafc19c2a4411612113b1cff10f318c62f07b9cf66144f98fb9f8e254e SHA512 c04cb98e37311ba0c4a1f49e7dd80226075265042c20138f5ee6e79eb702f94c258e2c7075e76f4ff70df912b295d7a15753bd3dd287ea0fa5e0d0a8dd51358a
 DIST wine-1.1.19.tar.bz2 15222941 MD5 95957027df57eca2a6f4686204dfb33a RMD160 6775956f41c3f0204547dff7302d73e89aa445c3 SHA1 6f589cdd630d090839b941313748c8a70ad2c6f1 SHA256 795863589c8603c8570c3352f75c1f33dd5b0bfbd4f8e926dbdab33839771252 SHA512 7ed436c83c9072c174a858eee9cc3aadc24de23e1749995ebc3efe2069f2cd95095ed78c21a01957cd6f3f2ad13f4c73283dded64348da6113dcfc61ae0a79c0
-MKBUILD wine.mkbuild 4473 MD5 48922fd7126fc1df5d26a30a1d402027 RMD160 dc12bf313e3026c8554ecaf868bb23c8ea5f5133 SHA1 228d8adf1ad2f831ba9e39e2ae275a12be1736f4 SHA256 0d6aad736c2f4a49c12661c3cc8d755b2efd283e2d08f6da0e6087d46048bb6f SHA512 435dbc681df3f55c9868d9f8dcbaa3827094ee515c4d07eb7e5354981c127f4a04742470323d8fabbc31237ecbc2dd41bde49891ff350747bc9187867db08f1d
-SLACKBUILD wine.SlackBuild 7177 MD5 9e91afdd61106cd2d6740a5ccaca8353 RMD160 67e7df52e98b83c9715be644bd2e2d624e5641fc SHA1 4c80821c4936371f5da9538e9e0581a0dc33b092 SHA256 4acad4c3c5329d3eeafa3eeb1511fa8f5ee60a1f0da782f8a46db3938a7d0e77 SHA512 770b775d85a627d00ecd85851c3f253d615659d1ebd27597c54a493d49ff77e8b86b81cb07638c140b47b612d076be8188c52810361b427b549a5893000418a0
+DIST wine-1.1.22.tar.bz2 15354522 MD5 d1714d7b483316d656a47b61af3e48d9 RMD160 e863bcfcd880a86e8d1e9a14a45d68ecdbb297c4 SHA1 c46ab1be0d22dc87c644f50d70d9b93994a06fa3 SHA256 a7843842a4d54a4052b6b54394f168173357ce97a248ff77159cda3e6ed87e4e SHA512 b7a981e55531fad0744f96bfcf72c2793abfaa094883f0b6da46315b823cce8cad344911085476e25484c7376ebb048432ea5327c00a44c8460bf28f5e7bc585
+MKBUILD wine.mkbuild 4530 MD5 e7f430a91340052c37954a532e67eb5b RMD160 80cb686c5b8e5323af87daeb2f12e54e765f8407 SHA1 e7a2e7ba613a0d3a2bcc698ffe065ec58b5e6427 SHA256 4580355ba72cddae9680af140e977797cffd552b5fff1d667c71ef95d21ec255 SHA512 77a39fa668f8a8b2ed9afce75305661e07c6d77d92eb0dd3c648f2b846cdee40900d977ca0d112893902522694d7041067e2e44bfe59355453e28f06fe6087bd
+SLACK-REQUIRED slack-required 77 MD5 445d051bb743df0a992514c4a6262849 RMD160 ae7c468e897aa05b6588d156584f6ba67a4685af SHA1 3a7590824c3345cd1fe3e49feae035af6230683c SHA256 6ab8aeb34330e5ac830b1a788f7bbd0afd412ea7ffa5e90811d2a8c69c9a81b1 SHA512 a32ec581eab1e8eb121d006d414a677c0e6835a0b80f01d45593834a78a4b9a2072001520714569482b80896663aec120ebc99437b7058fd71ab0f331cd517bc
+SLACKBUILD wine.SlackBuild 7292 MD5 85325bece1b8c7912fcaf86b8e4346a2 RMD160 8cf3ee15337fe55b35eb97bc16515ec6d9401020 SHA1 8cf66c0b69d18d330a47148e5a26bfe709c57c3a SHA256 e918d13f83b7c21a18bd3bf51a064144d9535196fe2af2843ec08544b0816316 SHA512 0c55b4ed7fed885f32e4bf74e002b822de2cb171a685ce4705a690a0e62b01ceed27663d34ea9ba549c20bcf4952e422ff3f11d436d408e0d36a556a6cd0ec4f
diff --git a/app/emulation/wine/slack-required b/app/emulation/wine/slack-required
new file mode 100644
index 00000000..227d3109
--- /dev/null
+++ b/app/emulation/wine/slack-required
@@ -0,0 +1,4 @@
+# Dependency list to wine
+#
+# dependency [condition] [version]]
+freetype				
diff --git a/app/emulation/wine/wine.SlackBuild b/app/emulation/wine/wine.SlackBuild
index d4c31968..7feffc69 100755
--- a/app/emulation/wine/wine.SlackBuild
+++ b/app/emulation/wine/wine.SlackBuild
@@ -15,9 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for wine, by Rudson R. Alves
-# requires:  
-# tested: wine-1.1.19
-# model: generic.mkSlackBuild $Rev: 784 $
+# requires: freetype 
+# tested: wine-1.1.22
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -32,17 +32,18 @@ CWD="$(pwd)"
 SRC_NAME="wine"
 PKG_NAME="wine"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.1.19}
+SRC_VERSION=${VERSION:=1.1.22}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/emulation/wine"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --localstatedir=/var"}
-NUMJOBS=${NUMJOBS:="-j4"}
+NUMJOBS=${NUMJOBS:="-j3"}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -214,7 +215,8 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then