merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@232 18ef50b8-d735-4ccd-97c1-689132df3dd9

3 files changed, 10 insertions, 10 deletions

diff --git a/net/dns/avahi/avahi.mkbuild b/net/dns/avahi/avahi.mkbuild
index 84269b2..b5bb3e8 100644
--- a/net/dns/avahi/avahi.mkbuild
+++ b/net/dns/avahi/avahi.mkbuild
@@ -12,7 +12,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://avahi.org/download/avahi-0.6.21.tar.gz"
+[[DOWNLOAD FOLDER URL]]="http://avahi.org/download/avahi-0.6.22.tar.gz"
 
 # 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/net/im/bitlbee/bitlbee.mkbuild b/net/im/bitlbee/bitlbee.mkbuild
index 960c533..33a5466 100644
--- a/net/im/bitlbee/bitlbee.mkbuild
+++ b/net/im/bitlbee/bitlbee.mkbuild
@@ -26,7 +26,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://get.bitlbee.org/src/bitlbee-1.2.tar.gz"
+[[DOWNLOAD FOLDER URL]]="http://get.bitlbee.org/src/bitlbee-1.2.1.tar.gz"
 
 #
 # Dependency list input
@@ -73,7 +73,7 @@ off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
  on: untar_source
-off: patch_source
+ on: patch_source
  on: configure
  on: make_package
  on: install_package
diff --git a/net/www/gnash/gnash.mkbuild b/net/www/gnash/gnash.mkbuild
index 6a767e3..5a4f343 100644
--- a/net/www/gnash/gnash.mkbuild
+++ b/net/www/gnash/gnash.mkbuild
@@ -17,7 +17,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="ftp://mirrors.kernel.org/gnu/gnash/0.8.2/gnash-0.8.2.tar.bz2"
+[[DOWNLOAD FOLDER URL]]="ftp://mirrors.kernel.org/gnu/gnash/0.8.3/gnash-0.8.3.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'
@@ -62,7 +62,7 @@
 # Dependency list input
 # Enter string: "dependency_1 [condiction_1] [versio_1]: dependency_2 [condiction_2] [versio_2]"
 # Example:
-[[SLACK REQUIRED]]=""
+[[SLACK REQUIRED]]="agg: boost: ffmpeg"
 
 #
 # Decompress program
@@ -78,11 +78,11 @@
 #
 # Documentation files. Null ("") to auto-set commom doc-files:
 # NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING readme.*
-[[DOCUMENTATION FILES]]="ABOUT-NLS AUTHORS COPYING ChangeLog ChangeLog-0.8.0 ChangeLog-0.8.1 INSTALL NEWS README TODO"
+[[DOCUMENTATION FILES]]="ABOUT-NLS AUTHORS COPYING ChangeLog ChangeLog-0.8.0 ChangeLog-0.8.1 ChangeLog-0.8.2 ChangeLog-0.8.3 INSTALL NEWS README TODO"
 
 #
 # ./configure options
-[[OTHER CONFIGURE ARGS]]="--sysconfdir=/etc --with-plugindir=$LIBDIR/mozilla/plugins --x-libraries=$LIBDIR"
+[[OTHER CONFIGURE ARGS]]="--sysconfdir=/etc --with-plugindir=$LIBDIR/mozilla/plugins --x-libraries=$LIBDIR --enable-nspr --enable-media=ffmpeg --with-ffmpeg-incl=/usr/include --with-nspr-incl=/usr/include/seamonkey/nspr --with-nspr-lib=/usr/lib/seamonkey --with-boost-incl=/usr/include/boost/boost "
 
 #
 # PREFIX. Default /usr
@@ -90,7 +90,7 @@
 
 #
 # Number of jobs
-[[NUMBER OF JOBS]]="-j4"
+[[NUMBER OF JOBS]]="-j3"
 
 #---------------------
 # Others changes
@@ -100,7 +100,7 @@
 #[[SIGNING KEY]]=""
 #[[SIGNING KEY URL]]=""
 [[PATCH FILES]]=""
-[[NUMBER OF PREFIX SLASHES TO STRIP]]="1"
+[[NUMBER OF PREFIX SLASHES TO STRIP]]="0"
 
 # SlackBuild model
 [[SLACKBUILD MODEL]]="generic.mkSlackBuild"
@@ -128,7 +128,7 @@ off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
  on: untar_source
-off: patch_source
+ on: patch_source
  on: configure
  on: make_package
  on: install_package