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

commit c3594b35db3a3f9a047f952fb862116ac1304b04
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sun Apr 25 21:59:38 2010 +0200

git-1.7.1-1-i686

* Bump version.

diff --git a/.gitignore b/.gitignore
index a49e0d5..428add4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,32 @@
-Changelog
-*.tar
-*.tar.gz
-*.tar.bz2
-*.tar.lzma
-*.log.bz2
-*.zip
-*.exe
-*.tgz
-*.tbz2
-*.html
+*~
*.asc
-*.xpi
-*.jar
-*.run
-*.rpm
+*.bin
*.deb
*.diff.gz
-*.jpg
-*.sign
-*.sig
+*.exe
*.fpm
+*.html
+*.jar
+*.jpg
*.log
-*.bin
-*~
+*.log.bz2
+*.rpm
+*.run
+*.sig
+*.sign
+*.tar
+*.tar.bz2
+*.tar.gz
+*.tar.lzma
+*.tbz2
+*.tgz
+*.xpi
+*.zip
+AUTHORS
+Changelog*
+Filelist.txt
+boot
+frugalware-*
pkg
pkg.*
src
-frugalware-i686
-frugalware-x86_64
-boot
-Filelist.txt
-ChangeLog.txt
-AUTHORS
diff --git a/source/apps-extra/hplip/FrugalBuild 
b/source/apps-extra/hplip/FrugalBuild
index 9fc2c9f..b2bc7ea 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=('libusb' 'cups' 'net-snmp>=5.5' 'sane-backends' 'libtool>=2.2.2' 
'dbus-python>=0.80')
+depends=('libtool>=2.2.2' 'dbus-python>=0.80')
# cupsddk: dynamic PPD support
# reportlab: fax cover page support
-rodepends=('ghostscript' 'pyqt4' 'reportlab' 'cupsddk')
+rodepends=("hplip-driver>=$pkgver" 'pyqt4' 'reportlab')
conflicts=('hpijs')
provides=('hpijs')
groups=('apps-extra')
@@ -19,6 +19,14 @@ 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
@@ -27,6 +35,17 @@ 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 fb04cf8..a67a181 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=('scriptlet' 'nofakeroot')
+depends=("${depen...@]}" 'glibc' 'util-linux' 'psmisc')
+options=("${optio...@]}" '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=('nobuild')
+options=("${optio...@]}" '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 351f7fc..edee302 100644
--- a/source/apps-extra/virtualbox-modules/FrugalBuild
+++ b/source/apps-extra/virtualbox-modules/FrugalBuild
@@ -6,22 +6,19 @@ pkgver=3.0.12
pkgrel=8
pkgdesc="Kernel modules for VirtualBox"
url="http://www.virtualbox.org";
-Finclude kernel-module
_F_kernelmod_scriptlet=${pkgname}.install
-install=${pkgname}.install
+Finclude kernel-module
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

@@ -30,6 +27,7 @@ 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 0a126e1..7dd49f8 100644
--- a/source/apps/consolekit/FrugalBuild
+++ b/source/apps/consolekit/FrugalBuild
@@ -7,7 +7,8 @@ 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 273bf54..06e8233 100644
--- a/source/apps/gnupg2/FrugalBuild
+++ b/source/apps/gnupg2/FrugalBuild
@@ -3,13 +3,12 @@

pkgname=gnupg2
origname=gnupg
-pkgver=2.0.13
+pkgver=2.0.15
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' 'pth' 'libksba>=1.0' 
'libusb' 'readline' 'libgpg-error>=1.0' 'libgcrypt')
-makedepends=('libassuan>=0.9.3')
+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')
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'"
@@ -17,11 +16,10 @@ 
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 pth libgpg-error>=1.0')
+subdepends=('libgcrypt libgpg-error>=1.0')
subgroups=('apps')
subarchs=('i686 x86_64 ppc')

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

}

+sha1sums=('3596668fb9cc8ec0714463a5009f990fc23434b0')

-
-sha1sums=('2ff42aff14cdddafc291d44ac1968af5f09a9d4d')
# optimization OK
diff --git a/source/devel-extra/apache-log4j/FrugalBuild 
b/source/devel-extra/apache-log4j/FrugalBuild
index a76fccd..b1d8896 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.15
+pkgver=1.2.16
pkgrel=1
pkgdesc="A low-overhead robust logging package for Java."
url="http://logging.apache.org/log4j/";
diff --git a/source/devel-extra/git/FrugalBuild 
b/source/devel-extra/git/FrugalBuild
index e153c89..8a956eb 100644
--- a/source/devel-extra/git/FrugalBuild
+++ b/source/devel-extra/git/FrugalBuild
@@ -8,7 +8,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
USE_HTMLMAN=${USE_HTMLMAN:-"y"}

pkgname=git
-pkgver=1.7.0.5
+pkgver=1.7.1
Fuse $USE_DEVEL && pkgver=1.6.1.87.g1562445
pkgrel=1
pkgdesc="A fast, scalable, distributed revision control system."
diff --git a/source/devel-extra/j2sdk/FrugalBuild 
b/source/devel-extra/j2sdk/FrugalBuild
index 6aed72d..bb61567 100644
--- a/source/devel-extra/j2sdk/FrugalBuild
+++ b/source/devel-extra/j2sdk/FrugalBuild
@@ -2,6 +2,7 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=j2sdk
+_F_archive_name=jdk
pkgver=6
update=20
realver=${pkgver}u$update
@@ -11,7 +12,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|grep 
'jdk-[0-9].*bin$'|sed 's/.*jdk-\(.*\)-dlj-linux.*/\1/;s/u$update//;q'"
+up2date="elinks -dump 
https://jdk-distros.dev.java.net/developer.html|Flastarchive 
'-dlj-linux-.*\.bin'"
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 19a609b..9852b57 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
-Fpkgversep=
+_F_archive_name=Pharo
+_F_archive_number=26778 # Changes at each version
pkgver=1.0
-pkgextraver=-10505-rc1dev10.01.1
-pkgrel=1
-_F_archive_name_full=${_F_archive_name}${pkgver}${pkgextraver}
+pkgextraver=-10517-rc4dev10.04.1
+pkgrel=2
+_F_archive_name_full=${_F_archive_name}${Fpkgversep}${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 http://pharo-project.org/pharo-download '\.zip'"
-source=(http://gforge.inria.fr/frs/download.php/25156/$_F_archive_name$Fpkgversep$pkgver$pkgextraver.zip)
+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)
sha1sums=('b62160b3e76c17896e77799629e09b2d898db59c')

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

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

+_F_genscriptlet_hooks=("${_f_genscriptlet_hoo...@]}" Fkernel_genscriptlet_hook)
+
###
# * subpkg()
# * subdepends()
# * subarchs()
-# * subinstall()
+# * _F_genscriptlet_subinstall()
# * suboptions()
# * subgroups()
# * subdescs()
@@ -176,7 +179,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')
-subinstall=('src/kernel-source.install' '')
+_F_genscriptlet_subinstall=("$Fincdir/kernel.install" '')
suboptions=('nodocs' '')
if [ -z "$_F_kernel_name" ]; then
subpkgs=("${subpk...@]}" 'kernel-headers')
@@ -185,7 +188,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')
-       subinstall=("${subinsta...@]}" '')
+       _F_genscriptlet_subinstall=("${_f_genscriptlet_subinsta...@]}" '')
suboptions=("${suboptio...@]}" '')
else
subgroups=('devel-extra' 'apps-extra')
diff --git a/source/include/mozilla-i18n.sh b/source/include/mozilla-i18n.sh
index c66b985..7adecd0 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 c16ceff..516a0af 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 8006dd7..593d28f 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 ae6fb4b..d9b8b7b 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -80,6 +80,7 @@
# * Farchs
# * Fconfopts
# * LDFLAGS
+# * _F_gensciptlet_hooks
###
Fpkgversep="-"
Fsrcdir="$startdir/src"
@@ -92,6 +93,7 @@ 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
@@ -124,6 +126,38 @@ 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.
@@ -140,7 +174,7 @@ Fcd() {
if [ "$#" -eq 1 ]; then
Fmessage "Going to the source directory..."
cd "$Fsrcdir/$1" || Fdie
-               elif [ "$#" -eq 0 ]; then
+               elif [ "$#" -eq 0 -a -d "$Fsrcdir/$_F_cd_path" ]; then
Fcd "$_F_cd_path"
fi
fi
@@ -254,7 +288,7 @@ Fmv() {

###
# * Fsubmv(): Move a file under the subpkg Fdestdir. Parameters: 1) name of the
-# subpackage 2) name of the file 2) destination
+# subpackage 2) name of the file 3) destination
###
Fsubmv()
{
@@ -263,10 +297,6 @@ 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
}
@@ -489,8 +519,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
}

###
@@ -1406,3 +1436,12 @@ 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 03997bc..cc9d59b 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -130,8 +130,7 @@ 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 24372ec..043a175 100644
--- a/source/kde/kdenetwork/FrugalBuild
+++ b/source/kde/kdenetwork/FrugalBuild
@@ -79,6 +79,13 @@ 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 35f573b..563ebcb 100644
--- a/source/lib/libassuan/FrugalBuild
+++ b/source/lib/libassuan/FrugalBuild
@@ -2,17 +2,16 @@
# Maintainer: voroskoi <voros...@freemail.hu>

pkgname=libassuan
-pkgver=1.0.5
+pkgver=2.0.0
pkgrel=1
pkgdesc="Libassuan  is the IPC library used by some GnuPG related software."
url="http://www.gnupg.org/related_software/libassuan/";
-depends=() # This time it's _really_ empty ;-)
-makedepends=('pth') # it must be compiled with pth for gpg-agent
+depends=('libgpg-error')
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/libassuan/libassuan-$pkgver.tar.bz2)
+source=(http://gd.tuwien.ac.at/privacy/gnupg/$pkgname/$pkgname-$pkgver.tar.bz2)
Finclude texinfo
signatures=($source.sig)

diff --git a/source/network-extra/bcmwl/FrugalBuild 
b/source/network-extra/bcmwl/FrugalBuild
index 712c182..783a677 100644
--- a/source/network-extra/bcmwl/FrugalBuild
+++ b/source/network-extra/bcmwl/FrugalBuild
@@ -19,7 +19,6 @@ 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/nvidia-xconfig/FrugalBuild 
b/source/x11-extra/nvidia-xconfig/FrugalBuild
index a1202d8..6464d89 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 settings configuration tool."
+pkgdesc="nVidia xconfig generation 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 f48be59..54714f8 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 1022810..31a9af3 100644
--- a/source/xapps-extra/rss-glx/FrugalBuild
+++ b/source/xapps-extra/rss-glx/FrugalBuild
@@ -2,45 +2,42 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=rss-glx
-Fpkgversep="_"
-pkgver=0.8.1
-pkgrel=4
+pkgver=0.9.0
+pkgrel=1
pkgdesc="Really Slick Screensavers written in OpenGL"
-depends=('libglx' 'libgl' 'mesa' 'openal>=1.7.411' 'imagemagick>=6.4.8_9' 
'xscreensaver')
+depends=('libgl' '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";
-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')
+sha1sums=('afbf8a6bbfd2d19e3c4298f8f445a635f17c8b2e')

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

-       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 a6acb7a..8f5c4d5 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,47 +36,51 @@ build() {
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1

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

Fbuild \
-       --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
+               --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

# 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 309273f..0af6ebe 100644
--- a/source/xapps/gpgme/FrugalBuild
+++ b/source/xapps/gpgme/FrugalBuild
@@ -2,17 +2,17 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=gpgme
-pkgver=1.1.4
+pkgver=1.3.0
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=(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"
+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";
Finclude texinfo

-
# optimization OK
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 20d34e4..7de2490 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -19,7 +19,6 @@ 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')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to