Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92f42ec177356adb64c4503f0348bb2a88268986

commit 92f42ec177356adb64c4503f0348bb2a88268986
Author: Michel Hermier <herm...@frugalware.org>
Date:   Mon Apr 26 12:33:35 2010 +0200

git-1.7.1-1-i686

This partially reverts commit c3594b35db3a3f9a047f952fb862116ac1304b04.
What is left
* .gitignore reordering
* Remove of linuxwacom.
* Remove of unused xulrunner patches.

Partially reverts

diff --git a/source/apps-extra/hplip/FrugalBuild 
b/source/apps-extra/hplip/FrugalBuild
index b2bc7ea..9fc2c9f 100644
--- a/source/apps-extra/hplip/FrugalBuild
+++ b/source/apps-extra/hplip/FrugalBuild
@@ -8,10 +8,10 @@ _F_sourceforge_ext=.tar.gz
Finclude sourceforge
pkgdesc="HPLIP is an HP developed solution for printing, scanning, and faxing 
with HP inkjet and laser based printers in Linux."
makedepends=('sane-backends')
-depends=('libtool>=2.2.2' 'dbus-python>=0.80')
+depends=('libusb' 'cups' 'net-snmp>=5.5' 'sane-backends' 'libtool>=2.2.2' 
'dbus-python>=0.80')
# cupsddk: dynamic PPD support
# reportlab: fax cover page support
-rodepends=("hplip-driver>=$pkgver" 'pyqt4' 'reportlab')
+rodepends=('ghostscript' 'pyqt4' 'reportlab' 'cupsddk')
conflicts=('hpijs')
provides=('hpijs')
groups=('apps-extra')
@@ -19,14 +19,6 @@ archs=('i686' 'x86_64' 'ppc')
sha1sums=('7cdbb879cc122152aa9e3d5dc2d7dd3baf3b0604')
options=('nodocs')

-subpkgs=("${subpackag...@]}" 'hplip-driver')
-subdescs=("${subdes...@]}" 'HPLIP printing, scanning, and scanning driver for 
HP inkjet and laser based printers.')
-subdepends=("${subdepen...@]}" 'cups libusb net-snmp sane-backends')
-subrodepends=("${subrodepen...@]}" 'cupsddk ghostscript')
-subinstall=("${subinsta...@]}" 'hplip.install')
-subgroups=("${subgrou...@]}" 'apps')
-subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
-
build() {
Fcd
Fsed 'SYSFS' 'ATTRS' data/rules/56-hpmud_support.rules
@@ -35,17 +27,6 @@ build() {

# sane-backends
Frm /etc/sane.d/dll.conf
-
-       Fsplit hplip-driver /etc/hp/
-       Fsplit hplip-driver /etc/udev/
-       Fsplit hplip-driver /usr/bin/hp-mkuri
-       Fsplit hplip-driver /usr/lib/cups/
-       Fsplit hplip-driver /usr/lib/libhpip.\*
-       Fsplit hplip-driver /usr/lib/libhpmud.\*
-       Fsplit hplip-driver /usr/lib/sane/
-       Fsplit hplip-driver /usr/share/cups/
-       Fsplit hplip-driver /usr/share/hal/
-       Fsplit hplip-driver /var/lib/hp/
}

# optimization OK
diff --git a/source/apps-extra/rlocate/FrugalBuild 
b/source/apps-extra/rlocate/FrugalBuild
index a67a181..fb04cf8 100644
--- a/source/apps-extra/rlocate/FrugalBuild
+++ b/source/apps-extra/rlocate/FrugalBuild
@@ -7,8 +7,8 @@ pkgrel=15
pkgdesc="rlocate is an implementation of the locate command"
_F_kernelmod_scriptlet=$pkgname.install
Finclude kernel-module
-depends=("${depen...@]}" 'glibc' 'util-linux' 'psmisc')
-options=("${optio...@]}" 'nofakeroot')
+depends=(${depen...@]} 'glibc' 'util-linux' 'psmisc')
+options=('scriptlet' 'nofakeroot')
conflicts=('slocate')
provides=('slocate')
backup=('etc/updatedb.conf')
@@ -25,7 +25,7 @@ sha1sums=('b7e2b9a56bb47debabe8bdd5edbaed31f718a145' \
'1c8dc977a76e2eccaa9076578c3a67a53cc5e46c')
# it conflicts with kernel-2.6.24, maybe they'll convert to redirfs then we can
# remove nobuild again
-options=("${optio...@]}" 'nobuild')
+options=('nobuild')


## NOTE: rlocate _CANNOT_ be built as a user
diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild 
b/source/apps-extra/virtualbox-modules/FrugalBuild
index edee302..351f7fc 100644
--- a/source/apps-extra/virtualbox-modules/FrugalBuild
+++ b/source/apps-extra/virtualbox-modules/FrugalBuild
@@ -6,19 +6,22 @@ pkgver=3.0.12
pkgrel=8
pkgdesc="Kernel modules for VirtualBox"
url="http://www.virtualbox.org";
-_F_kernelmod_scriptlet=${pkgname}.install
Finclude kernel-module
+_F_kernelmod_scriptlet=${pkgname}.install
+install=${pkgname}.install
groups=('apps-extra')
archs=('i686' 'x86_64')
license=('GPL-2')
up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'"
source=(http://gentoo.zerodev.it/files/vbox-kernel-module-src-${pkgver}.tar.bz2 
 ${pkgname}.install\
kernel-2.6.33.patch)
+options=('scriptlet' 'genscriptlet')
sha1sums=('fa02bff8062a332875e4d8269871db7f7d3bd5f6' \
'e529d5411395df6dcb64c303ea0956d92eb29516' \
'280ba431e961217aa777688d3d3dc56d946c2117')

build() {
+       _F_cd_path="."
Fpatchall
Fmkdir ${_F_kernelmod_dir}/kernel/misc

@@ -27,7 +30,6 @@ build() {
make KERN_DIR=${_F_kernelmod_dir}/build 
MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} \
MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc 
INSTALL_MOD_PATH=${Fdestdir} install || Fdie

-       Fbuild_kernelmod_scriptlet
}

# optimalization OK - uses the kernel's option
diff --git a/source/apps/consolekit/FrugalBuild 
b/source/apps/consolekit/FrugalBuild
index 7dd49f8..0a126e1 100644
--- a/source/apps/consolekit/FrugalBuild
+++ b/source/apps/consolekit/FrugalBuild
@@ -7,8 +7,7 @@ pkgver=0.4.1
pkgrel=1
pkgdesc="Framework for defining and tracking users, login sessions and seats."
url="http://www.freedesktop.org/wiki/Software/ConsoleKit";
-source=(http://www.freedesktop.org/software/ConsoleKit/dist/$_F_archive_name-$pkgver.tar.bz2
 \
-       rc.xconsolekit \
+source=(http://www.freedesktop.org/software/ConsoleKit/dist/$_F_archive_name-$pkgver.tar.bz2
 rc.xconsolekit \
consolekit-0.4.0-polkit-automagic.patch)
up2date="Flasttar http://www.freedesktop.org/software/ConsoleKit/dist";
depends=('dbus-glib' 'zlib' 'pam' 'polkit')
diff --git a/source/apps/gnupg2/FrugalBuild b/source/apps/gnupg2/FrugalBuild
index 06e8233..273bf54 100644
--- a/source/apps/gnupg2/FrugalBuild
+++ b/source/apps/gnupg2/FrugalBuild
@@ -3,12 +3,13 @@

pkgname=gnupg2
origname=gnupg
-pkgver=2.0.15
+pkgver=2.0.13
pkgrel=1
pkgdesc="GnuPG2 is the new modularized version of GnuPG supporting OpenPGP and 
S/MIME"
url="http://www.gnupg.org/";
## libldap
-depends=('openssl>=0.9.8-10' 'bzip2' 'curl>=7.19.0' 'libassuan>=2.0.0' 
'libksba>=1.0' 'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
+depends=('openssl>=0.9.8-10' 'bzip2' 'curl>=7.19.0' 'pth' 'libksba>=1.0' 
'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
+makedepends=('libassuan>=0.9.3')
groups=('apps')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.gnupg.org/download/index.html |grep 
gnupg-2.0.*tar |sed -n -e 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;1 p'"
@@ -16,10 +17,11 @@ 
source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2)

subpkgs=('gpg-agent')
subdescs=('gpg-agent is made for handling gpg-keys')
-subdepends=('libgcrypt libgpg-error>=1.0')
+subdepends=('libgcrypt pth libgpg-error>=1.0')
subgroups=('apps')
subarchs=('i686 x86_64 ppc')

+
build()
{
Fcd $origname-$pkgver
@@ -38,6 +40,7 @@ build()

}

-sha1sums=('3596668fb9cc8ec0714463a5009f990fc23434b0')

+
+sha1sums=('2ff42aff14cdddafc291d44ac1968af5f09a9d4d')
# optimization OK
diff --git a/source/devel-extra/apache-log4j/FrugalBuild 
b/source/devel-extra/apache-log4j/FrugalBuild
index b1d8896..a76fccd 100644
--- a/source/devel-extra/apache-log4j/FrugalBuild
+++ b/source/devel-extra/apache-log4j/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=apache-log4j
-pkgver=1.2.16
+pkgver=1.2.15
pkgrel=1
pkgdesc="A low-overhead robust logging package for Java."
url="http://logging.apache.org/log4j/";
diff --git a/source/devel-extra/j2sdk/FrugalBuild 
b/source/devel-extra/j2sdk/FrugalBuild
index bb61567..6aed72d 100644
--- a/source/devel-extra/j2sdk/FrugalBuild
+++ b/source/devel-extra/j2sdk/FrugalBuild
@@ -2,7 +2,6 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=j2sdk
-_F_archive_name=jdk
pkgver=6
update=20
realver=${pkgver}u$update
@@ -12,7 +11,7 @@ url="http://java.sun.com/j2se/downloads.html";
rodepends=('j2re')
groups=('devel-extra')
archs=('i686' 'x86_64')
-up2date="elinks -dump 
https://jdk-distros.dev.java.net/developer.html|Flastarchive 
'-dlj-linux-.*\.bin'"
+up2date="elinks -dump https://jdk-distros.dev.java.net/developer.html|grep 
'jdk-[0-9].*bin$'|sed 's/.*jdk-\(.*\)-dlj-linux.*/\1/;s/u$update//;q'"
if [ "$CARCH" == "i686" ]; then
_arch="i586"
_parch="i386"
diff --git a/source/devel-extra/pharo-image/FrugalBuild 
b/source/devel-extra/pharo-image/FrugalBuild
index 9852b57..19a609b 100644
--- a/source/devel-extra/pharo-image/FrugalBuild
+++ b/source/devel-extra/pharo-image/FrugalBuild
@@ -2,12 +2,12 @@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=pharo-image
-_F_archive_name=Pharo
-_F_archive_number=26778 # Changes at each version
+_F_archive_name=pharo
+Fpkgversep=
pkgver=1.0
-pkgextraver=-10517-rc4dev10.04.1
-pkgrel=2
-_F_archive_name_full=${_F_archive_name}${Fpkgversep}${pkgver}${pkgextraver}
+pkgextraver=-10505-rc1dev10.01.1
+pkgrel=1
+_F_archive_name_full=${_F_archive_name}${pkgver}${pkgextraver}
pkgdesc="The official Pharo image."
url="http://pharo-project.org/";
license="MIT"
@@ -15,8 +15,8 @@ rodepends=('squeak')
groups=('devel-extra')
archs=('i686' 'x86_64')
#_F_archive_grepv='\.sources|'
-up2date="Flastarchive 'https://gforge.inria.fr/frs/?group_id=1299' '\.zip'"
-source=(http://gforge.inria.fr/frs/download.php/$_F_archive_number/$_F_archive_name$Fpkgversep$pkgver$pkgextraver.zip)
+up2date="Flastarchive http://pharo-project.org/pharo-download '\.zip'"
+source=(http://gforge.inria.fr/frs/download.php/25156/$_F_archive_name$Fpkgversep$pkgver$pkgextraver.zip)
sha1sums=('b62160b3e76c17896e77799629e09b2d898db59c')

build()
diff --git a/source/include/genscriptlet.sh b/source/include/genscriptlet.sh
index e0cf6e9..d878604 100644
--- a/source/include/genscriptlet.sh
+++ b/source/include/genscriptlet.sh
@@ -98,9 +98,9 @@ __Fgenscriptlet()
Fmessage "Generating scriptlet: $(basename "$1")"
local install_src="$1"
local install_dest="${Fsrcdir}/$(basename "$1")"
-       Fmessage "Ffullpath: $(Ffullpath "$startdir" "$1")"

-       if ! Fisfullpath "$install_src"; then
+       if [ ! -e "$install_src" ]; then
+               # if $install_src don't exist, it is relative to $startdir
install_src="$startdir/$1"
fi
Fmessage "Copying $1 to $install_dest"
diff --git a/source/include/kernel.install b/source/include/kernel.install
index 7e001eb..a8922f1 100644
--- a/source/include/kernel.install
+++ b/source/include/kernel.install
@@ -1,10 +1,10 @@
# arg 1:  the new package version
post_install()
{
-       v...@_f_kernel_ver@@_F_kernel_uname@
-       if ! [ -e /boot/@_F_kernel_path@ ]; then
+       ver=$_F_kernel_ver$_F_kernel_uname
+       if ! [ -e /boot/$_F_kernel_path ]; then
cd /boot
-               ln -sf @_f_kernel_p...@-$ver @_F_kernel_path@
+               ln -sf $_F_kernel_path-$ver $_F_kernel_path
ln -sf config-$ver config
ln -sf System.map-$ver System.map
fi
@@ -15,12 +15,12 @@ post_install()
# arg 2:  the old package version
pre_upgrade()
{
-       v...@_f_kernel_ver@@_F_kernel_uname@
-       if [ -e /boot/@_f_kernel_p...@-$ver ]; then
+       ver=$_F_kernel_ver$_F_kernel_uname
+       if [ -e /boot/$_F_kernel_path-$ver ]; then
# remove old kernel backups
-               rm -f /boot/@_f_kernel_p...@-*.old
+               rm -f /boot/$_F_kernel_path-*.old
# save the pervious kernel
-               mv /boot/@_f_kernel_p...@-$ver /boot/@_f_kernel_p...@-$ver.old
+               mv /boot/$_F_kernel_path-$ver /boot/$_F_kernel_path-$ver.old
fi
}

diff --git a/source/include/kernel.sh b/source/include/kernel.sh
index 32b6507..3d5e903 100644
--- a/source/include/kernel.sh
+++ b/source/include/kernel.sh
@@ -124,8 +124,7 @@ fi
# * up2date
# * source()
# * signatures()
-# * _F_genscriptlet_install
-# * _F_genscriptlet_hooks
+# * install
###
url="http://www.kernel.org";
rodepends=('module-init-tools' 'sed')
@@ -145,7 +144,7 @@ else
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_F_kernel_ver.tar.bz2 
config)
fi
signatures=("${source[0]}.sign" '' '' '')
-_F_genscriptlet_install="$Fincdir/kernel.install"
+install="src/kernel.install"

[ "$_F_kernel_stable" -gt 0 ] && \
source=(${sour...@]} 
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$_F_kernel_ver.$_F_kernel_stable.bz2)
 && \
@@ -164,13 +163,11 @@ do
signatures=("${signatur...@]}" '')
done

-_F_genscriptlet_hooks=("${_f_genscriptlet_hoo...@]}" Fkernel_genscriptlet_hook)
-
###
# * subpkg()
# * subdepends()
# * subarchs()
-# * _F_genscriptlet_subinstall()
+# * subinstall()
# * suboptions()
# * subgroups()
# * subdescs()
@@ -179,7 +176,7 @@ subpkgs=("kernel$_F_kernel_name-source" 
"kernel$_F_kernel_name-docs")
subdepends=("make gcc kernel-headers" "")
subrodepends=("kernel$_F_kernel_name-docs" "kernel$_F_kernel_name")
subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc')
-_F_genscriptlet_subinstall=("$Fincdir/kernel.install" '')
+subinstall=('src/kernel-source.install' '')
suboptions=('nodocs' '')
if [ -z "$_F_kernel_name" ]; then
subpkgs=("${subpk...@]}" 'kernel-headers')
@@ -188,7 +185,7 @@ if [ -z "$_F_kernel_name" ]; then
subgroups=('devel' 'apps' 'devel devel-core')
subdescs=('Linux kernel source' 'Linux kernel documentation' 'Linux kernel 
include files')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
-       _F_genscriptlet_subinstall=("${_f_genscriptlet_subinsta...@]}" '')
+       subinstall=("${subinsta...@]}" '')
suboptions=("${suboptio...@]}" '')
else
subgroups=('devel-extra' 'apps-extra')
diff --git a/source/include/mozilla-i18n.sh b/source/include/mozilla-i18n.sh
index 7adecd0..c66b985 100644
--- a/source/include/mozilla-i18n.sh
+++ b/source/include/mozilla-i18n.sh
@@ -27,11 +27,11 @@ Finclude i18n
###

if [ -z "$_F_mozilla_i18n_xpidirname" ]; then
-       
_F_mozilla_i18n_xpidirname="$_F_mozilla_i18n_dirname$_F_mozilla_i18n_name/releases/$pkgver/linux-i686/xpi/"
+       
_F_mozilla_i18n_xpidirname="$_F_mozilla_i18n_dirname$_F_mozilla_i18n_name/releases/$pkgver/linux-i686/xpi"
fi

if [ -z "$_F_mozilla_i18n_mirror" ]; then
-       _F_mozilla_i18n_mirror="ftp://ftp.mozilla.org/pub/mozilla.org/";
+       _F_mozilla_i18n_mirror="ftp://ftp.mozilla.org/pub/mozilla.org";
fi

###
@@ -51,7 +51,7 @@ fi
if [ -z "$pkdesc" ]; then
pkgdesc="Language support for ${_F_mozilla_i18n_name^}"
fi
-up2date="eval \"_F_archive_name=$_F_mozilla_i18n_name; Flastarchive 
$_F_mozilla_i18n_mirror$_F_mozilla_i18n_dirname$_F_mozilla_i18n_name/releases/latest/source/
 '\.source\.tar\.bz2'\""
+up2date="eval \"_F_archive_name=$_F_mozilla_i18n_name; Flastarchive 
$_F_mozilla_i18n_mirror/$_F_mozilla_i18n_dirname$_F_mozilla_i18n_name/releases/latest/source
 '\.source\.tar\.bz2'\""
url="http://www.mozilla.org/projects/l10n/mlp.html";
options=('noversrc')
rodepends=("$_F_mozilla_i18n_name>=$pkgver" "${subpacka...@]}")
@@ -73,7 +73,7 @@ mozilla_i18n_foreach_lang() {
# * mozilla_i18n_lang_add()
###
mozilla_i18n_lang_add() {
-       source=("${sour...@]}" 
"$_F_mozilla_i18n_mirror$_F_mozilla_i18n_xpidirname$1.xpi")
+       source=("${sour...@]}" 
"$_F_mozilla_i18n_mirror/$_F_mozilla_i18n_xpidirname/$1.xpi")
subpkgs=("${subpk...@]}" "$_F_mozilla_i18n_name-${1,,}")
subdescs=("${subdes...@]}" "`i18n_language_from_locale "$1"` language support 
for ${_F_mozilla_i18n_name^}") # Requires a locale to name function.
subrodepends=("${subrodepen...@]}" "$_F_mozilla_i18n_name>=$pkgver")
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 516a0af..c16ceff 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -80,8 +80,8 @@ groups=('x11-extra')
pkgdesc="3D accelerated display driver for Nvidia cards"
url="http://www.nvidia.com/object/unix.html";
if [ -n "$_F_nvidia_arch" ]; then
-#      
source=(http://us.download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
-       
source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
+       
source=(http://us.download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
+#      
source=(ftp://download.nvidia.com/XFree86/Linux-$_F_nvidia_arch/$pkgver/$_F_nvidia_name.run)
fi
up2date="lynx -dump http://www.nvidia.com/object/unix.html|grep -m1 
'"$_F_nvidia_up2date"'|sed 's/.*]//;s/-/_/'"

diff --git a/source/include/perl.sh b/source/include/perl.sh
index 593d28f..8006dd7 100644
--- a/source/include/perl.sh
+++ b/source/include/perl.sh
@@ -64,7 +64,7 @@
[ -z "$_F_cd_path" ] && _F_cd_path="$_F_perl_sourcename-$pkgver"
pkgname="perl-`echo $_F_perl_name|tr [A-Z] [a-z]`"
[ -z "$pkgrel" ] && pkgrel=1
-depends=("${depen...@]}" 'perl>=5.10.1')
+depends=(${depen...@]} 'perl>=5.10.1')
groups=('devel-extra')
archs=('i686')

diff --git a/source/include/util.sh b/source/include/util.sh
index 4c02ab0..74545d9 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -80,7 +80,6 @@
# * Farchs
# * Fconfopts
# * LDFLAGS
-# * _F_gensciptlet_hooks
###
Fpkgversep="-"
Fsrcdir="$startdir/src"
@@ -93,7 +92,6 @@ Fmenudir="/usr/share/applications"
Farchs=('i686' 'x86_64' 'ppc')
Fbuildchost="`arch`-frugalware-linux"
Fconfopts=""
-_F_gensciptlet_hooks=('Futil_genscriptlet_hook')
## Move to makepkg.conf for Kalgan+1
export LDFLAGS="-Wl,--hash-style=both"
unset LANG LC_ALL
@@ -126,38 +124,6 @@ Fexec() {
"$@"
}

-Fisfullpath() {
-       case "$1" in
-       /*) return 0;;
-       *) return 1;;
-       esac
-}
-
-###
-# Ffullpath(): Return the given path if it is a full (absolute) path, or the
-# full path of the given path resolved in the given base path.
-# Parameters: 1) optional base path, default is '.' 2) path to solve.
-###
-Ffullpath() {
-       local base
-       case "$#" in
-       1)      base='.'
-               ;;
-       2)      base="$1"
-               shift
-               ;;
-       *)      Fmessage "Ffullpath: Invalid number of argument."
-               Fdie
-               ;;
-       esac
-
-       if Fisfullpath "$1"; then
-               echo "$1"
-       else
-               readlink -m "$base/$1"
-       fi
-}
-
###
# * Fcd(): Go to the source directory if it is $Fsrcdir currently. Parameter:
# optional source directory, default is $_F_cd_path.
@@ -174,7 +140,7 @@ Fcd() {
if [ "$#" -eq 1 ]; then
Fmessage "Going to the source directory..."
cd "$Fsrcdir/$1" || Fdie
-               elif [ "$#" -eq 0 -a -d "$Fsrcdir/$_F_cd_path" ]; then
+               elif [ "$#" -eq 0 ]; then
Fcd "$_F_cd_path"
fi
fi
@@ -288,7 +254,7 @@ Fmv() {

###
# * Fsubmv(): Move a file under the subpkg Fdestdir. Parameters: 1) name of the
-# subpackage 2) name of the file 3) destination
+# subpackage 2) name of the file 2) destination
###
Fsubmv()
{
@@ -297,6 +263,10 @@ Fsubmv()
msg2 "$2 -> $3"
for i in "$destdir"/$2 # expand $2 if possible
do
+               if [ ! -e "$i" -a ! -h "$i" ]; then # expand failed ?
+                       Fmessage "No such file $2$info!! Typo? ($i)"
+                       Fdie
+               fi
mv "$i" "$destdir/$3" || Fdie
done
}
@@ -519,8 +489,8 @@ Ficonrel() {
###
Fln() {
Fmessage "Creating symlink(s): $1"
-       Fmkdir "$(dirname "$2")"
-       ln -sf "$1" "$Fdestdir/$2" || Fdie
+       Fmkdir "`dirname $2`"
+       ln -sf $1 "$Fdestdir"/$2 || Fdie
}

###
@@ -1440,12 +1410,3 @@ Fextract() {
fi
fi
}
-
-###
-# * Futil_genscriptlet_hook(): the genscriplet hook for the util.sh variables.
-###
-Futil_genscriptlet_hook()
-{
-       Freplace 'pkgname' "$1"
-       Freplace 'pkgver' "$1"
-}
diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index cc9d59b..03997bc 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -130,7 +130,8 @@ sha1sums=('bf02ec2a8dd1fcf923e215f395b33f09e0f58a33' \

build()
{
-       KDE_make_split
+
+        KDE_make_split

KDE_project_install apps/plasma
Fsplit plasma-applet-folderview /\*
diff --git a/source/kde/kdenetwork/FrugalBuild 
b/source/kde/kdenetwork/FrugalBuild
index 043a175..24372ec 100644
--- a/source/kde/kdenetwork/FrugalBuild
+++ b/source/kde/kdenetwork/FrugalBuild
@@ -79,13 +79,6 @@ subgroups=("${subgrou...@]}" 'kde')
subreplaces=("${subreplac...@]}" '')
subarchs=("${subarc...@]}" 'i686 x86_64 ppc')

-subpkgs=("${subpk...@]}" "$pkgname-strigi-analyzer")
-subdescs=("${subdes...@]}" "Strigi Analyzer for Kdenetworks.")
-subdepends=("${subdepen...@]}" "strigi>=0.7.2-2 libgcc libtiff libqtgui>=$Qt4 
libice libxrender libxext libuuid")
-subgroups=("${subgrou...@]}" 'kde')
-subreplaces=("${subreplac...@]}" '')
-subarchs=("${subarc...@]}" 'i686 x86_64 ppc')
-
_F_kde_subpkgs=("${subpk...@]}")

subpkgs=("${subpk...@]}" "$pkgname-filesharing")
diff --git a/source/lib/libassuan/FrugalBuild b/source/lib/libassuan/FrugalBuild
index 563ebcb..35f573b 100644
--- a/source/lib/libassuan/FrugalBuild
+++ b/source/lib/libassuan/FrugalBuild
@@ -2,16 +2,17 @@
# Maintainer: voroskoi <voros...@freemail.hu>

pkgname=libassuan
-pkgver=2.0.0
+pkgver=1.0.5
pkgrel=1
pkgdesc="Libassuan  is the IPC library used by some GnuPG related software."
url="http://www.gnupg.org/related_software/libassuan/";
-depends=('libgpg-error')
+depends=() # This time it's _really_ empty ;-)
+makedepends=('pth') # it must be compiled with pth for gpg-agent
groups=('lib')
archs=('i686' 'x86_64' 'ppc')
license="LGPLv2.1"
up2date="Flasttar ftp://ftp.gnupg.org/GnuPG/libassuan/";
-source=(http://gd.tuwien.ac.at/privacy/gnupg/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://gd.tuwien.ac.at/privacy/gnupg/libassuan/libassuan-$pkgver.tar.bz2)
Finclude texinfo
signatures=($source.sig)

diff --git a/source/network-extra/bcmwl/FrugalBuild 
b/source/network-extra/bcmwl/FrugalBuild
index 783a677..712c182 100644
--- a/source/network-extra/bcmwl/FrugalBuild
+++ b/source/network-extra/bcmwl/FrugalBuild
@@ -19,6 +19,7 @@ fi
_F_archive_name="hybrid-portsrc-x86_64-v"
Fpkgversep=""
up2date="Flasttar $url"
+_F_cd_path="."
source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-$_arch-v$pkgver.tar.gz)

build()
diff --git a/source/x11-extra/linuxwacom/60-wacom.rules 
b/source/x11-extra/linuxwacom/60-wacom.rules
deleted file mode 100644
index 19cb4f5..0000000
--- a/source/x11-extra/linuxwacom/60-wacom.rules
+++ /dev/null
@@ -1,74 +0,0 @@
-# udev rules for wacom tablets.
-# These rules were compiled for the Debian GNU/Linux distribution,
-# but others may, and indeed are encouraged to, use them also.
-#
-# Should you do so, PLEASE CO-ORDINATE ANY CHANGES OR ADDITIONS
-# of new devices with Ron <r...@debian.org> so that we can try
-# to present users with with a standard set of device nodes
-# which they can rely on across the board.
-
-# Convenience link for the common case of a single tablet.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", SYMLINK="input/wacom"
-
-# Port specific link for users of multiple tablets of the same type.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ENV{ID_PATH}=="?*", 
SYMLINK+="input/by-path/$env{ID_PATH}-wacom"
-
-# Type-named links for multiple tablets.  If you want to use multiple
-# tablets of the _same_ type, you will probably need to use the links
-# from /dev/input/by-path to identify which is plugged into what usb
-# port.  For different types though, just pick your links from the
-# list below.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0000", 
SYMLINK+="input/tablet-penpartner"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", 
SYMLINK+="input/tablet-graphire"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", 
SYMLINK+="input/tablet-graphire2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", 
SYMLINK+="input/tablet-graphire2-5x7"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", 
SYMLINK+="input/tablet-graphire3"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", 
SYMLINK+="input/tablet-graphire3-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", 
SYMLINK+="input/tablet-graphire4-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", 
SYMLINK+="input/tablet-graphire4-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0060", 
SYMLINK+="input/tablet-volito"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0061", 
SYMLINK+="input/tablet-penstation2"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0062", 
SYMLINK+="input/tablet-volito2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0063", 
SYMLINK+="input/tablet-volito2-2x3"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0064", 
SYMLINK+="input/tablet-penpartner2"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0020", 
SYMLINK+="input/tablet-intuos-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0021", 
SYMLINK+="input/tablet-intuos-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0022", 
SYMLINK+="input/tablet-intuos-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0023", 
SYMLINK+="input/tablet-intuos-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0024", 
SYMLINK+="input/tablet-intuos-12x18"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0030", 
SYMLINK+="input/tablet-pl400"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0031", 
SYMLINK+="input/tablet-pl500"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0032", 
SYMLINK+="input/tablet-pl600"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0033", 
SYMLINK+="input/tablet-pl600sx"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0034", 
SYMLINK+="input/tablet-pl550"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0035", 
SYMLINK+="input/tablet-pl800"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0037", 
SYMLINK+="input/tablet-pl700"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0038", 
SYMLINK+="input/tablet-pl510"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0039", 
SYMLINK+="input/tablet-dtu710"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00C0", 
SYMLINK+="input/tablet-dtf521"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00C4", 
SYMLINK+="input/tablet-dtf720"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0003", 
SYMLINK+="input/tablet-cintiq_partner"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0041", 
SYMLINK+="input/tablet-intuos2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0042", 
SYMLINK+="input/tablet-intuos2-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0043", 
SYMLINK+="input/tablet-intuos2-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0044", 
SYMLINK+="input/tablet-intuos2-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0045", 
SYMLINK+="input/tablet-intuos2-12x18"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B0", 
SYMLINK+="input/tablet-intuos3-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B1", 
SYMLINK+="input/tablet-intuos3-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B2", 
SYMLINK+="input/tablet-intuos3-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B3", 
SYMLINK+="input/tablet-intuos3-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B4", 
SYMLINK+="input/tablet-intuos3-12x19"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00B5", 
SYMLINK+="input/tablet-intuos3-6x11"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="003F", 
SYMLINK+="input/tablet-cintiq21ux"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0047", 
SYMLINK+="input/tablet-intuos2-6x8a"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0065", 
SYMLINK+="input/tablet-bamboo"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c6", 
SYMLINK+="input/tablet-cintiq12wx"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", 
SYMLINK+="input/tablet-bamboofun-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", 
SYMLINK+="input/tablet-bamboofun-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0069", 
SYMLINK+="input/tablet-bamboo1"
-
-# Check and repossess the device if a module other than the wacom one
-# is already bound to it.
-
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ACTION=="add", 
RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
-
diff --git a/source/x11-extra/linuxwacom/FrugalBuild 
b/source/x11-extra/linuxwacom/FrugalBuild
deleted file mode 100644
index 0bca2e8..0000000
--- a/source/x11-extra/linuxwacom/FrugalBuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Compiling Time: 0.09 SBU
-# Maintainer: Miklos Vajna <vmik...@frugalware.org>
-
-pkgname=linuxwacom
-pkgver=0.8.5_8
-pkgrel=2
-pkgdesc="Drivers, libraries, and doc for configuring and running Wacom 
tablets."
-_F_sourceforge_ext=".tar.bz2"
-Finclude sourceforge
-depends=('xorg-server>=1.6.1' 'ncurses' 'libxi>=1.1.3')
-makedepends=('tk' 'inputproto' 'randrproto')
-rodepends=('udev')
-groups=('x11-extra')
-archs=('i686' 'x86_64' 'ppc')
-source=($source check_driver{,.1} 60-wacom.rules fix_include.diff)
-sha1sums=('376b716ee33ba9f478f6cac537172602898b63cf' \
-          '12ae37807a03f36be2c5cc47e444475677b41693' \
-          '7adf948f2d6f29635e80f4cc336799b7962d2a9a' \
-          'c8063c86189a7b3459a33b3c5ccfca36fa5439fd' \
-          'bd55fc5df48215957082e0a26369aa1599466cc3')
-_F_cd_path="$_F_sourceforge_name$_F_sourceforge_sep${pkgver//_/-}"
-
-# disabled features:
-# kernel driver: it's already in the kernel package since 2.6.23
-# wacom_drv.o: it's disabled when using --enable-dlloader
-
-build()
-{
-       Fpatchall
-       Fmake \
-               --enable-dlloader \
-               --enable-wacom \
-               --enable-tabletdev \
-               --enable-wacomdrv \
-               --enable-wacdump \
-               --enable-xsetwacom
-       Fmakeinstall
-       Fexe /lib/udev/check_driver
-       Fman check_driver.1
-       Ffile /lib/udev/rules.d/60-wacom.rules
-}
-
-# optimization OK
diff --git a/source/x11-extra/linuxwacom/check_driver 
b/source/x11-extra/linuxwacom/check_driver
deleted file mode 100644
index 6e49aa1..0000000
--- a/source/x11-extra/linuxwacom/check_driver
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-
-#logger check_driver called with: $1 - $2 - $3 -
-
-wanted=$1
-devpath=$2
-bustype=$3
-
-device=$(readlink /sys/$devpath/device)
-device=${device##*/}
-driver=$(readlink /sys/$devpath/device/driver)
-driver=${driver##*/}
-
-logger device $device is bound to the $driver driver
-
-if [ "$driver" != "$wanted" ]; then
-    logger must rebind
-    echo -n "$device" > /sys/$devpath/device/driver/unbind
-    echo -n "$device" > /sys/bus/$bustype/drivers/$wanted/bind
-else
-    logger no need to rebind
-fi
-
diff --git a/source/x11-extra/linuxwacom/check_driver.1 
b/source/x11-extra/linuxwacom/check_driver.1
deleted file mode 100644
index 5016cbb..0000000
--- a/source/x11-extra/linuxwacom/check_driver.1
+++ /dev/null
@@ -1,21 +0,0 @@
-.TH wacom\-tools 1 "5 Nov 2004" "Frugalware Linux" "Frugalware"
-.SH NAME
-check_driver \- Linux 2.6(.16+) userspace device rebinding helper.
-
-.SH SYNOPSIS
-.B check_driver driver devpath bustype
-
-.SH DESCRIPTION
-This is a \fBRUN\fP script that may be invoked from a udev rule to ensure the
-correct driver is bound to a particular device, in situations where a
-basic driver may bind to it first but a more specialised one is available.
-
-.SH EXAMPLE
-For the wacom device, a rule like this is used:
-
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", ACTION=="add", 
RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
-
-.SH COPYRIGHT
-2006, Ron Lee <r...@debian.org>.  Created for the Debian GNU/Linux
-distribution.  It may be freely distributed elsewhere.
-
diff --git a/source/x11-extra/linuxwacom/fix_include.diff 
b/source/x11-extra/linuxwacom/fix_include.diff
deleted file mode 100644
index 07370d4..0000000
--- a/source/x11-extra/linuxwacom/fix_include.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- linuxwacom-0.8.2-1.orig/src/xdrv/xf86Wacom.h       2009-01-15 
14:57:45.000000000 -0500
-+++ linuxwacom-0.8.2-1/src/xdrv/xf86Wacom.h    2009-01-15 14:59:33.000000000 
-0500
-@@ -23,7 +23,7 @@
- /****************************************************************************/
-
- #include "../include/xdrv-config.h"
--#ifdef WCM_XORG_XSERVER_1_6
-+#ifdef WCM_XORG
-    #include <xorg-server.h>
-    #include <xorgVersion.h>
- #else
---- linuxwacom-0.8.2-1.orig/src/xdrv/wcmConfig.c       2008-12-30 
16:46:01.000000000 -0500
-+++ linuxwacom-0.8.2-1/src/xdrv/wcmConfig.c    2009-01-15 15:11:13.000000000 
-0500
-@@ -994,7 +994,7 @@ static XF86ModuleVersionInfo xf86WcmVers
-       MODULEVENDORSTRING,
-       MODINFOSTRING1,
-       MODINFOSTRING2,
--#ifdef WCM_XORG_XSERVER_1_6
-+#ifdef WCM_XORG
-       XORG_VERSION_CURRENT,
- #else
-       XF86_VERSION_CURRENT,
diff --git a/source/x11-extra/nvidia-xconfig/FrugalBuild 
b/source/x11-extra/nvidia-xconfig/FrugalBuild
index 6464d89..a1202d8 100644
--- a/source/x11-extra/nvidia-xconfig/FrugalBuild
+++ b/source/x11-extra/nvidia-xconfig/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=nvidia-xconfig
pkgver=195.36.15
pkgrel=1
-pkgdesc="nVidia xconfig generation tool."
+pkgdesc="nVidia settings configuration tool."
url="ftp://download.nvidia.com/XFree86/$pkgname/";
up2date="Flasttar $url"
depends=('gtk+2' 'libxv')
diff --git a/source/xapps-extra/qcad/FrugalBuild 
b/source/xapps-extra/qcad/FrugalBuild
index 54714f8..f48be59 100644
--- a/source/xapps-extra/qcad/FrugalBuild
+++ b/source/xapps-extra/qcad/FrugalBuild
@@ -6,7 +6,7 @@ pkgver=2.0.5.0
pkgrel=1
pkgdesc="A 2D CAD package based upon Qt"
url="http://www.ribbonsoft.com/qcad.html";
-depends=() #('qt')
+depends=('qt')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://www.ribbonsoft.com/qcad_downloads.html | grep 
Community | sed 's/.*d-\(.*\).1.*/\1/' | tail -n1"
diff --git a/source/xapps-extra/rss-glx/FrugalBuild 
b/source/xapps-extra/rss-glx/FrugalBuild
index 31a9af3..1022810 100644
--- a/source/xapps-extra/rss-glx/FrugalBuild
+++ b/source/xapps-extra/rss-glx/FrugalBuild
@@ -2,42 +2,45 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=rss-glx
-pkgver=0.9.0
-pkgrel=1
+Fpkgversep="_"
+pkgver=0.8.1
+pkgrel=4
pkgdesc="Really Slick Screensavers written in OpenGL"
-depends=('libgl' 'openal>=1.7.411' 'imagemagick>=6.4.8_9' 'xscreensaver')
+depends=('libglx' 'libgl' 'mesa' 'openal>=1.7.411' 'imagemagick>=6.4.8_9' 
'xscreensaver')
makedepends=('gnome-screensaver')
groups=('xapps-extra')
archs=('i686')
-_F_sourceforge_sep="_"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://rss-glx.sourceforge.net";
-sha1sums=('afbf8a6bbfd2d19e3c4298f8f445a635f17c8b2e')
+source=(${source/-$pkgver/_$pkgver} gcc43.patch 
rss-glx-0.8.1-imagemagick.patch)
+up2date="lynx -dump http://rss-glx.sourceforge.net/ | Flasttar"
+sha1sums=('188871d7940de8a7c3f9e622ddc131e46567eab5' \
+          '46f1753be0fe0993856cf437f7b7e697953cf3dc' \
+          '7ad7acb7d97880df33e7a57a20b10c60617927de')

build() {
-       Fcd ${pkgname}_${pkgver}
-#      sh ./autogen.sh || Fdie
-       Fbuild --bindir=/usr/libexec/xscreensaver/ \
-               --with-kdessconfigdir=/usr/share/applications/screensavers
+       Fcd
+       sh ./autogen.sh || Fdie
+       Fbuild

-#      Fmkdir /usr/share/applnk/System/ScreenSavers
-#      cd $Fdestdir
-#      for file in *.desktop; do
-#              Fmv /$file /usr/share/applnk/System/ScreenSavers/
-#      done
+       Fmkdir /usr/share/applnk/System/ScreenSavers
+       cd $Fdestdir
+       for file in *.desktop; do
+               Fmv /$file /usr/share/applnk/System/ScreenSavers/
+       done

-#      cd $Fdestdir/usr/bin
-#      Fmkdir /usr/libexec/xscreensaver
-#      for file in *; do
-#              Fmv /usr/bin/$file /usr/libexec/xscreensaver/
-#      done
-#      cd ..
-#      rmdir bin
+       cd $Fdestdir/usr/bin
+       Fmkdir /usr/libexec/xscreensaver
+       for file in *; do
+               Fmv /usr/bin/$file /usr/libexec/xscreensaver/
+       done
+       cd ..
+       rmdir bin

-#      Fmkdir /usr/share/applications/screensavers
-#      cd $Fdestdir/usr/share/applications/screensavers
-#      for i in $Fdestdir/usr/share/xscreensaver/config/*; do
-#              /usr/bin/xscreensaver2gnome $i
-#      done
+       Fmkdir /usr/share/applications/screensavers
+       cd $Fdestdir/usr/share/applications/screensavers
+       for i in $Fdestdir/usr/share/xscreensaver/config/*; do
+               /usr/bin/xscreensaver2gnome $i
+       done
}
diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index 8f5c4d5..a6acb7a 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -20,7 +20,7 @@ 
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/sou
$pkgname.desktop \
${pkgname}-safe-mode.desktop \
firefox-3.0.10-gcc44.patch)
-#signatures=("${source[0]}.asc" '' '' '' '')
+signatures=("${source[0]}.asc" '' '' '' '')
options=('scriptlet')

build() {
@@ -36,51 +36,47 @@ build() {
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1

-       # Let jars get compressed.
Fsed '\-0' '\-9' config/make-jars.pl

Fbuild \
-               --disable-activex \
-               --disable-activex-scripting \
-               --disable-calendar \
-               --disable-composer \
-               --disable-debug \
-               --disable-installer \
-               --disable-libxul \
-               --disable-logging \
-               --disable-pedantic \
-               --disable-mailnews \
-               --disable-mochitest \
-               --disable-profilesharing \
-               --disable-tests \
-               --enable-application=browser \
-               --enable-crypto \
-               --enable-default-toolkit=cairo-gtk2 \
-               --enable-image-decoders=all \
-               --enable-image-encoders=all \
-               --enable-mathml \
-               --enable-necko-protocols=all \
-               --enable-nspr-autoconf \
-               --enable-official-branding \
-               --enable-safe-browsing \
-               --enable-single-profile \
-               --enable-strip \
-               --enable-svg \
-               --enable-system-cairo \
-               --enable-system-lcms \
-               --enable-system-sqlite \
-               --enable-xft \
-               --enable-toolkit-cairo-gtk2 \
-               --with-default-mozilla-five-home=/usr/lib/$pkgname \
-               --with-distribution-id=Frugalware \
-               --with-pthreads \
-               --with-system-bz2 \
-               --with-system-jpeg \
-               --with-system-mng \
-               --with-system-nspr \
-               --with-system-nss \
-               --with-system-png \
-               --with-system-zlib
+       --with-default-mozilla-five-home=/usr \
+       --with-system-nspr \
+       --with-system-nss \
+       --with-system-jpeg \
+       --with-system-zlib \
+       --with-system-bz2 \
+       --with-pthreads \
+       --with-distribution-id=Frugalware \
+       --enable-crypto \
+       --enable-official-branding \
+       --enable-svg \
+       --enable-mathml \
+       --enable-strip \
+       --enable-xft \
+       --enable-toolkit-cairo-gtk2 \
+       --enable-default-toolkit=cairo-gtk2 \
+       --enable-nspr-autoconf \
+       --enable-single-profile \
+       --enable-application=browser \
+       --enable-image-decoders=all \
+       --enable-image-encoders=all \
+       --enable-system-cairo \
+       --enable-safe-browsing \
+       --enable-system-lcms \
+       --enable-system-sqlite \
+       --enable-necko-protocols=all \
+       --disable-debug \
+       --disable-tests \
+       --disable-mochitest \
+       --disable-logging \
+       --disable-installer \
+       --disable-activex \
+       --disable-activex-scripting \
+       --disable-pedantic \
+       --disable-mailnews \
+       --disable-calendar \
+       --disable-composer \
+       --disable-profilesharing

# Get rid of versions in path names.
Fmv /usr/include/$pkgname-$pathver /usr/include/$pkgname
diff --git a/source/xapps/gpgme/FrugalBuild b/source/xapps/gpgme/FrugalBuild
index 0af6ebe..309273f 100644
--- a/source/xapps/gpgme/FrugalBuild
+++ b/source/xapps/gpgme/FrugalBuild
@@ -2,17 +2,17 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=gpgme
-pkgver=1.3.0
+pkgver=1.1.4
pkgrel=1
pkgdesc="A high-level crypto API for encryption"
url="http://www.gnupg.org/related_software/gpgme/";
groups=('xapps')
archs=('i686' 'x86_64' 'ppc')
depends=('gnupg' 'libgpg-error')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('0db69082abfbbbaf86c3ab0906f5137de900da73')
-#signatures=($source.sig)
-up2date="Flasttar http://www.gnupg.org/download/index.en.html";
+source=(http://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
+signatures=($source.sig)
+up2date="lynx -dump http://www.gnupg.org/download/index.en.html |grep gpgme 
|Flasttarbz2"
Finclude texinfo

+
# optimization OK
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 7de2490..20d34e4 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -19,6 +19,7 @@ depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 
'libjpeg' 'libmad' \
'x264>=20090416' 'dejavu-ttf' 'openal>=1.7.411' 'vidix' 'opencore-amr' 'aalib')
[ "$CARCH" == "i686" ] && depends=(${depen...@]} 'codecs')
[ "$CARCH" != "ppc" ] && depends=(${depen...@]} 'liblirc')
+makedepends=('gcc=4.4.2')
groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
archs=('i686' 'x86_64' 'ppc')
diff --git a/source/xlib/xulrunner/xulrunner-1.8.1.3-bug310924.patch 
b/source/xlib/xulrunner/xulrunner-1.8.1.3-bug310924.patch
deleted file mode 100644
index 3463154..0000000
--- a/source/xlib/xulrunner/xulrunner-1.8.1.3-bug310924.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- widget/src/gtk2/nsWindow.cpp       2006-01-09 05:48:56.000000000 +0000
-+++ widget/src/gtk2/nsWindow.cpp       2006-08-09 18:51:41.000000000 +0000
-@@ -3512,15 +3512,19 @@
-         gdkcursor = gdk_cursor_new(GDK_FLEUR);
-         break;
-     case eCursor_help:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"help");
-         newType = MOZ_CURSOR_QUESTION_ARROW;
-         break;
-     case eCursor_copy: // CSS3
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"copy");
-         newType = MOZ_CURSOR_COPY;
-         break;
-     case eCursor_alias:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"alias");
-         newType = MOZ_CURSOR_ALIAS;
-         break;
-     case eCursor_context_menu:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"context-menu");
-         newType = MOZ_CURSOR_CONTEXT_MENU;
-         break;
-     case eCursor_cell:
-@@ -3533,6 +3537,7 @@
-         newType = MOZ_CURSOR_HAND_GRABBING;
-         break;
-     case eCursor_spinning:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"wait"); // or maybe "progress" ?
-         newType = MOZ_CURSOR_SPINNING;
-         break;
-     case eCursor_zoom_in:
-@@ -3542,25 +3547,34 @@
-         newType = MOZ_CURSOR_ZOOM_OUT;
-         break;
-     case eCursor_not_allowed:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"not-allowed");
-+        newType = MOZ_CURSOR_NOT_ALLOWED;
-+        break;
-     case eCursor_no_drop:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"no-drop");
-         newType = MOZ_CURSOR_NOT_ALLOWED;
-         break;
-     case eCursor_col_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"col-resize");
-         newType = MOZ_CURSOR_COL_RESIZE;
-         break;
-     case eCursor_row_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"row-resize");
-         newType = MOZ_CURSOR_ROW_RESIZE;
-         break;
-     case eCursor_vertical_text:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"vertical-text");
-         newType = MOZ_CURSOR_VERTICAL_TEXT;
-         break;
-     case eCursor_all_scroll:
-         gdkcursor = gdk_cursor_new(GDK_FLEUR);
-         break;
-     case eCursor_nesw_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"nesw-resize");
-         newType = MOZ_CURSOR_NESW_RESIZE;
-         break;
-     case eCursor_nwse_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), 
"nwse-resize");
-         newType = MOZ_CURSOR_NWSE_RESIZE;
-         break;
-     case eCursor_ns_resize:
-@@ -3577,7 +3591,7 @@
-
-     // if by now we dont have a xcursor, this means we have to make a
-     // custom one
--    if (newType != 0xff) {
-+    if (!gdkcursor && newType != 0xff) {
-         gdk_color_parse("#000000", &fg);
-         gdk_color_parse("#ffffff", &bg);
-
diff --git a/source/xlib/xulrunner/xulrunner-1.8.1.3-bug325644.patch 
b/source/xlib/xulrunner/xulrunner-1.8.1.3-bug325644.patch
deleted file mode 100644
index 9f9987e..0000000
--- a/source/xlib/xulrunner/xulrunner-1.8.1.3-bug325644.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- dom/src/base/nsGlobalWindow.cpp    2006-06-29 05:24:47.000000000 +0000
-+++ dom/src/base/nsGlobalWindow.cpp    2006-08-09 18:55:49.000000000 +0000
-@@ -3571,7 +3571,9 @@
-   if (NS_SUCCEEDED(rv))
-     mDocShell->SetHasFocus(PR_FALSE);
-
--  return rv;
-+  // If embedding apps don't implement nsIEmbeddingSiteWindow2, we
-+  // shouldn't throw to web content.
-+  return NS_OK;
- }
-
- NS_IMETHODIMP
diff --git a/source/xlib/xulrunner/xulrunner-1.8.1.3-bug478843.patch 
b/source/xlib/xulrunner/xulrunner-1.8.1.3-bug478843.patch
deleted file mode 100644
index f0ec3ab..0000000
--- a/source/xlib/xulrunner/xulrunner-1.8.1.3-bug478843.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# HG changeset patch
-# User Jim Blandy <j...@mozilla.org>
-# Date 1239740085 25200
-# Node ID b528a9e1a777ebab8cd27001edddc831c5305abf
-# Parent be2ecf924da7b55fe6d58980baa8170d6308e773
-bug 478843 - /toolkit/xre/nsAppRunner.cpp:1424:6: error: #elif with no 
expression.  fix=Makoto Kato <m_k...@ga2.so-net.ne.jp>, r=benjamin
-
---- a/toolkit/xre/nsAppRunner.cpp      Tue Apr 14 14:47:55 2009 -0500
-+++ b/toolkit/xre/nsAppRunner.cpp      Tue Apr 14 13:14:45 2009 -0700
-@@ -1484,7 +1484,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
-   if (NS_FAILED(rv))
-     return rv;
-
--#elif
-+#else
- #error Oops, you need platform-specific code here
- #endif
-
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to