From 36765ff8fda0ca2f697346e2df6992cd418a1638 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9>
Date: Wed, 3 Sep 2008 03:46:06 +0000
Subject: merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@232 18ef50b8-d735-4ccd-97c1-689132df3dd9
---
 app/admin/hddtemp/hddtemp.mkbuild    | 9 ++++++---
 app/emulation/wine/wine.mkbuild      | 2 +-
 app/office/broffice/broffice.mkbuild | 2 +-
 app/text/rarian/rarian.mkbuild       | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/admin/hddtemp/hddtemp.mkbuild b/app/admin/hddtemp/hddtemp.mkbuild
index 2edb638..f7a3708 100644
--- a/app/admin/hddtemp/hddtemp.mkbuild
+++ b/app/admin/hddtemp/hddtemp.mkbuild
@@ -131,7 +131,7 @@ off: create_build_user_and_group
 off: svn_source
 off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
- on: gpg_signature_check
+off: gpg_signature_check
  on: untar_source
 off: patch_source
  on: configure
@@ -170,6 +170,9 @@ hddtemp: informations about drives that were reported to work with hddtemp.
 +
 +# Get new hddtemp.db
 +mkdir -p $PKG/usr/share/misc
-+wget [[DOWNLOAD FOLDER URL]]/hddtemp.db -P $PKG/usr/share/misc/
-+
++if [ ! -e $CWD/hddtemp.db ]; then
++  wget [[DOWNLOAD FOLDER URL]]/hddtemp.db -P $CWD/ || exit $ERROR_WGET
++fi
++mkdir -p $PKG/usr/share/misc
++cp $CWD/hddtemp.db $PKG/usr/share/misc/
 #p<
diff --git a/app/emulation/wine/wine.mkbuild b/app/emulation/wine/wine.mkbuild
index daceab8..b17755e 100644
--- a/app/emulation/wine/wine.mkbuild
+++ b/app/emulation/wine/wine.mkbuild
@@ -17,7 +17,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/wine/wine-0.9.59.tar.bz2"
+[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/wine/wine-1.0.tar.bz2"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
diff --git a/app/office/broffice/broffice.mkbuild b/app/office/broffice/broffice.mkbuild
index 18763cc..ae57ba7 100644
--- a/app/office/broffice/broffice.mkbuild
+++ b/app/office/broffice/broffice.mkbuild
@@ -35,7 +35,7 @@
 #
 # Package version.  Null ("") to auto-set.
 # Auto-set, get VERSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-[[VERSION]]="2.4.0"
+[[VERSION]]="2.4.1"
 
 #
 # Package extension. Null ("") to auto-set
diff --git a/app/text/rarian/rarian.mkbuild b/app/text/rarian/rarian.mkbuild
index b0cd61f..b3260b5 100644
--- a/app/text/rarian/rarian.mkbuild
+++ b/app/text/rarian/rarian.mkbuild
@@ -12,7 +12,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://ftp.acc.umu.se/pub/gnome/sources/rarian/0.6/rarian-0.6.0.tar.bz2"
+[[DOWNLOAD FOLDER URL]]="http://ftp.acc.umu.se/pub/gnome/sources/rarian/0.8/rarian-0.8.0.tar.bz2"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-- 
cgit v1.2.3