Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=0802d0974e3ae4d7e5ae6b4d247166d40c21df70
commit 0802d0974e3ae4d7e5ae6b4d247166d40c21df70
Author: crazy <[EMAIL PROTECTED]>
Date: Mon Mar 24 00:50:03 2008 +0100
include: update
* merge current
diff --git a/source/include/aspell.sh b/source/include/aspell.sh
index cea9bb7..6a612d3 100644
--- a/source/include/aspell.sh
+++ b/source/include/aspell.sh
@@ -24,10 +24,16 @@
#
# == OPTIONS
# * _F_aspell_lang: the language of the dictionary
-# * _F_aspell_ver (defaults to 6): the dictionary is made for this version of
aspell
+# * _F_aspell_ver (defaults to 6, or to 5, if pkgver starts with '0.5'): the
dictionary is made for this version of aspell
# * _F_aspell_noverstrip: don't unset _F_aspell_ver even if it is '5'
###
-[ -z "$_F_aspell_ver" ] && _F_aspell_ver=6
+if [ -z "$_F_aspell_ver" ]; then
+ if [ "${pkgver:0:3}" == "0.5" ]; then
+ _F_aspell_ver=5
+ else
+ _F_aspell_ver=6
+ fi
+fi
[ "$_F_aspell_ver" = "5" ] && [ -z "$_F_aspell_noverstrip" ] && unset
_F_aspell_ver
###
diff --git a/source/include/compiz.sh b/source/include/compiz.sh
index 1457124..f166b16 100644
--- a/source/include/compiz.sh
+++ b/source/include/compiz.sh
@@ -18,7 +18,7 @@
# archs=('i686' 'x86_64')
# Finclude compiz
# depends=("compiz-plugins-main=$pkgver" 'gtk+2' 'librsvg' 'dbus-glib>=0.71-2')
-# makedepends=('intltool' 'perl-xml')
+# makedepends=('intltool' 'perl-xml-parser')
# sha1sums=('7552df78bdeaee2fd601f2b22f21ec34d778113d')
# --------------------------------------------------
#
@@ -32,10 +32,12 @@
# to declare the real version
###
-compizver=0.6.0
+compizver=0.7.2
if [ -z "$_F_compiz_name" ]; then
_F_compiz_name=$pkgname
+else # -n $_F_compiz_name
+ _F_archive_name=$_F_compiz_name
fi
if [ -z "$_F_compiz_version" ]; then
@@ -55,7 +57,11 @@ pkgver=$_F_compiz_version
pkgdesc="Compiz is a compositing window manager using
GLX_EXT_texture_from_pixmap"
url="http://www.compiz-fusion.org/";
up2date="lynx -dump http://releases.compiz-fusion.org/$_F_compiz_version/ |
grep $_F_compiz_name | Flasttarbz2"
-source=(http://releases.compiz-fusion.org/$_F_compiz_version/$_F_compiz_name-$pkgver.tar.bz2)
+if [ $_F_compiz_name == "compiz" ]; then
+
source=(http://releases.compiz-fusion.org/$_F_compiz_version/compiz/$_F_compiz_name-$pkgver.tar.bz2)
+else
+
source=(http://releases.compiz-fusion.org/$_F_compiz_version/$_F_compiz_name-$pkgver.tar.bz2)
+fi
_F_cd_path="$_F_compiz_name-$_F_compiz_version"
###
diff --git a/source/include/drupal.sh b/source/include/drupal.sh
index b78f0a1..543ff2a 100644
--- a/source/include/drupal.sh
+++ b/source/include/drupal.sh
@@ -2,7 +2,7 @@
###
# = drupal.sh(3)
-# CSÉCSY László <[EMAIL PROTECTED]>
+# CSÃCSY László <[EMAIL PROTECTED]>
#
# == NAME
# drupal.sh - for Frugalware
@@ -13,7 +13,7 @@
# == EXAMPLE
# --------------------------------------------------
# # Compiling Time: 0 SBU
-# # Maintainer: CSÉCSY László <[EMAIL PROTECTED]>
+# # Maintainer: CSÃCSY László <[EMAIL PROTECTED]>
#
# _F_drupal_module=image
# pkgver=5.x_1.6
@@ -60,10 +60,18 @@ options=('stick' 'nodocs')
###
# == PROVIDED FUNCTIONS
-# * build()
+# * Fbuild_drupal()
###
-build()
+Fbuild_drupal()
{
Fmkdir var/www/drupal/sites/all/modules
mv $Fsrcdir/$_F_drupal_module
$Fdestdir/var/www/drupal/sites/all/modules/$_F_drupal_module
}
+
+###
+# * build()
+###
+build()
+{
+ Fbuild_drupal
+}
diff --git a/source/include/gem.sh b/source/include/gem.sh
index 9926899..085f285 100644
--- a/source/include/gem.sh
+++ b/source/include/gem.sh
@@ -24,6 +24,16 @@
# sha1sums=('2712601395ec0a059263b730b10db9f93cd5a1f1')
# --------------------------------------------------
#
+# == OPTIONS
+# * _F_gem_name (defaults to $pkgname): if you want to use a custom
+# package name (for example the upstream name contains uppercase letters) then
+# use this to declare the real name
+###
+if [ -z "$_F_gem_name" ]; then
+ _F_gem_name=$pkgname
+fi
+
+###
# == APPENDED VARIABLES
# * ruby to depends()
# * rubygems to makedepends()
@@ -36,16 +46,16 @@ makedepends=([EMAIL PROTECTED] 'rubygems')
# * source()
# * up2date
###
-source=(http://gems.rubyforge.org/gems/"$pkgname"-"$pkgver".gem)
-up2date='lynx -dump "http://rubyforge.vm.bytemark.co.uk/gems/"; | grep
"$pkgname-[0-9.]\+.gem$" | sed "s/.*$pkgname-\(.*\).gem.*/\1/" | Fsort | tail
-n 1'
+source=(http://gems.rubyforge.org/gems/"$_F_gem_name"-"$pkgver".gem)
+up2date='lynx -dump "http://rubyforge.vm.bytemark.co.uk/gems/"; | grep
"$_F_gem_name-[0-9.]\+.gem$" | sed "s/.*$_F_gem_name-\(.*\).gem.*/\1/" | Fsort
| tail -n 1'
###
# == PROVIDED FUNCTIONS
# * Finstallgem()
###
Finstallgem() {
- gem install "$pkgname" --local --version "$pkgver" --install-dir .
--ignore-dependencies
- cd gems/"$pkgname"-"$pkgver"
+ gem install "$_F_gem_name" --local --version "$pkgver" --install-dir .
--ignore-dependencies
+ cd gems/"$_F_gem_name"-"$pkgver"
Fpatchall
libdir=`ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]'`
archdir=`ruby -r rbconfig -e 'print Config::CONFIG["archdir"]'`
@@ -64,9 +74,9 @@ Finstallgem() {
fi
if [ -d doc -a -n "`ls doc`" ]; then
Fmkdir /usr/share/doc/"$pkgname"-"$pkgver"
- if [ -d doc/"$pkgname"-"$pkgver" -a -n "`ls
doc/$pkgname-$pkgver`" ]; then
- cp -R doc/"$pkgname"-"$pkgver"/*
"$Fdestdir"/usr/share/doc/"$pkgname"-"$pkgver" || Fdie
- rm -rf doc/"$pkgname"-"$pkgver"/ || Fdie
+ if [ -d doc/"$_F_gem_name"-"$pkgver" -a -n "`ls
doc/$pkgname-$pkgver`" ]; then
+ cp -R doc/"$_F_gem_name"-"$pkgver"/*
"$Fdestdir"/usr/share/doc/"$pkgname"-"$pkgver" || Fdie
+ rm -rf doc/"$_F_gem_name"-"$pkgver"/ || Fdie
fi
if [ -n "`ls doc`" ]; then
cp -R doc/* "$Fdestdir"/usr/share/doc/"$pkgname"-"$pkgver" || Fdie
diff --git a/source/include/gnome-scriptlet.sh
b/source/include/gnome-scriptlet.sh
index 4c7801a..352e015 100644
--- a/source/include/gnome-scriptlet.sh
+++ b/source/include/gnome-scriptlet.sh
@@ -69,6 +69,12 @@ fi
install="$_F_gnome_scriptlet"
###
+# == APPENDED VARIABLES
+# * genscriptlet to options()
+###
+options=([EMAIL PROTECTED] 'genscriptlet')
+
+###
# == PROVIDED FUNCTIONS
# * Fbuild_slice_scrollkeeper() removes scrollkeeper-update from Makefile.in
# and omf.make
diff --git a/source/include/gnome.sh b/source/include/gnome.sh
index 0828cdb..26c00fe 100644
--- a/source/include/gnome.sh
+++ b/source/include/gnome.sh
@@ -29,8 +29,9 @@
# * _F_gnome_name (defaults to $pkgname): if you want to use a custom package
# name (for example the upstream name contains uppercase letters) then use this
# to declare the real name
-# * _F_gnome_devel: if set, the unsable version will be used
-# NOTE: this is currently enabled by default for -current
+# * _F_gnome_devel: if set, the <number>.<odd> versions will not be ignored.
+# This is something you want for packages which are not part of GNOME releases
+# (like intltool) and where the <odd> number does not mean instability.
###
if [ -z "$_F_gnome_name" ]; then
diff --git a/source/include/java.sh b/source/include/java.sh
index 00f5110..e39f204 100644
--- a/source/include/java.sh
+++ b/source/include/java.sh
@@ -80,8 +80,8 @@ Fgcj()
if [ ! -d "`dirname $output`" ]; then
mkdir -p "`dirname $output`" || Fdie
fi
- echo "gcj ${CFLAGS/O2/O0} --main=$main -o $output $@"
- gcj ${CFLAGS/O2/O0} --main=$main -o $output $@ || Fdie
+ echo "gcj ${CFLAGS/O2/O0} ${_F_java_cflags/-fPIC } $_F_java_ldflags
--main=$main -o $output $@"
+ gcj ${CFLAGS/O2/O0} ${_F_java_cflags/-fPIC } $_F_java_ldflags
--main=$main -o $output $@ || Fdie
}
###
diff --git a/source/include/kde.sh b/source/include/kde.sh
index 5e07727..e8286ee 100644
--- a/source/include/kde.sh
+++ b/source/include/kde.sh
@@ -66,9 +66,10 @@ fi
## TODO: add mirror option
if [ "$_F_kde_defaults" -eq 1 ]; then
url="http://www.kde.org";
- _F_kde_ver=3.5.8
+ _F_kde_ver=3.5.9
pkgurl="ftp://ftp.solnet.ch/mirror/KDE/stable/$_F_kde_ver/src";
- up2date="lynx -dump http://www.kde.org/download/|grep
'$_F_kde_name'|sed -n '1 p'|sed 's/.*-\([^ ]*\) .*/\1/'"
+ #up2date="lynx -dump http://www.kde.org/download/|grep
'$_F_kde_name'|sed -n '1 p'|sed 's/.*-\([^ ]*\) .*/\1/'"
+ up2date=$_F_kde_ver
source=($pkgurl/$_F_kde_name-$pkgver.tar.bz2)
fi
if [ -z "$_F_cd_path" ]; then
diff --git a/source/include/kernel-module.sh b/source/include/kernel-module.sh
index 3c0c599..05dc890 100644
--- a/source/include/kernel-module.sh
+++ b/source/include/kernel-module.sh
@@ -32,6 +32,7 @@ Finclude kernel-version
# # no Fcheckkernel, crosscompilation verified
# Fsed '$(shell uname -r)' "$_F_kernelmod_uname" Makefile
# Fbuild
+# Fbuild_kernelmod_scriptlet
# }
# --------------------------------------------------
#
@@ -80,11 +81,12 @@ install=$_F_kernelmod_scriptlet
###
# == APPENDED VARIABLES
-# * scriptlet to options()
+# * scriptlet and genscriptlet to options()
###
-options=([EMAIL PROTECTED] 'scriptlet')
+options=([EMAIL PROTECTED] 'scriptlet' 'genscriptlet')
###
+# == PROVIDED FUNCTIONS
# * Fbuild_kernelmod_scriptlet() generates a scriptlet for the given package
from
# the template according to the declared options
###
@@ -95,7 +97,6 @@ Fbuild_kernelmod_scriptlet()
}
###
-# == PROVIDED FUNCTIONS
# * Fcheckkernel: Checks if the version of the running kernel equals to the
# installed one, this is required if the crosscompilation is not verified.
# Never use this function outside build().
diff --git a/source/include/kernel-source.install
b/source/include/kernel-source.install
index 8868938..7af0232 100644
--- a/source/include/kernel-source.install
+++ b/source/include/kernel-source.install
@@ -1,17 +1,24 @@
post_install()
{
- ver=$_F_kernel_ver-$_F_kernel_rel
- arch |grep -q 'i.86' && KARCH=i386 || KARCH=`arch`
- if [ -e /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/.config ];
then
- rm -f /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/config
+ if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then
+ arch |grep -q 'i.86' && OLD_KARCH=i386 || OLD_KARCH=`arch`
+ KARCH=x86
else
- mv /usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/config \
-
/usr/src/linux-${ver/-*}$_F_kernel_name-fw${ver#*-}/.config
+ arch |grep -q 'i.86' && KARCH=i386 || KARCH=`arch`
+ fi
+
+ if [ -e /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/.config ]; then
+ rm -f /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/config
+ else
+ mv /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/config \
+ /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/.config
fi
# architecture specific tasks
cd /usr/src/linux
make include/linux/version.h
ln -sf asm-$KARCH include/asm
+ ## we don't want to break to much =)
+ [ -n $OLD_KARCH ] && ln -sf asm-$KARCH include/asm-$OLD_KARCH
make scripts
make prepare
}
diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh
index 7b331b5..f5f4ab6 100644
--- a/source/include/kernel-version.sh
+++ b/source/include/kernel-version.sh
@@ -15,6 +15,6 @@
# * _F_kernelver_rel: the kernel release
# * _F_kernelver_stable: the number of the -stable patch to use (if any)
###
-_F_kernelver_ver=2.6.23
-_F_kernelver_rel=2
-_F_kernelver_stable=8
+_F_kernelver_ver=2.6.24
+_F_kernelver_rel=4
+_F_kernelver_stable=3
diff --git a/source/include/kernel.sh b/source/include/kernel.sh
index 12d23e9..36de660 100644
--- a/source/include/kernel.sh
+++ b/source/include/kernel.sh
@@ -46,11 +46,8 @@ Finclude kernel-version
# * _F_kernel_rc: if set, the version of the rc patch to use (example: "6")
# * _F_kernel_mm: if set, the version of the mm patch to use (example: "2")
# * _F_kernel_git if set, the version of the git patch to use (example: "3")
-# * _F_kernel_dontsedarch: if set, don't replace 486 with your CARCH in the
kernel config
# * _F_kernel_dontfakeversion if set, don't replace the kernel version string
# with a generated one (from _F_kernel_ver, _F_kernel_name and _F_kernel_rel)
-# * _F_kernel_manualamd64: if set, don't update the config automatically to add
-# 32bit emulation support on x86_64
# * _F_kernel_uname: specify the kernel version manually (defaults to
# $_F_kernel_name-fw$_F_kernel_rel)
#
@@ -91,9 +88,6 @@ if [ -z "$_F_kernel_git" ]; then
_F_kernel_git=0
fi
-if [ -z "$_F_kernel_dontsedarch" ]; then
- _F_kernel_dontsedarch=0
-fi
if [ -z "$_F_kernel_dontfakeversion" ]; then
_F_kernel_dontfakeversion=0
fi
@@ -101,6 +95,14 @@ if [ -z "$_F_kernel_uname" ]; then
_F_kernel_uname="$_F_kernel_name-fw$_F_kernel_rel"
fi
+if [ -n "$_F_kernel_dontsedarch" ]; then
+ Fmessage "Option _F_kernel_dontsedarch was removed and does nothing at
the moment, please update your FrugalBuild!."
+fi
+
+if [ -n "$_F_kernel_manualamd64" ]; then
+ Fmessage "Option _F_kernel_manualamd64 was removed and does nothing at
the moment, please update your FrugalBuild!."
+fi
+
_F_kernel_rcver=${_F_kernel_ver%.*}.$((${_F_kernel_ver#*.*.}+1))-rc$_F_kernel_rc
if [ $_F_kernel_rc -gt 0 ]; then
_F_kernel_mmver=$_F_kernel_rcver-mm$_F_kernel_mm
@@ -154,10 +156,14 @@ if [ -z "$_F_kernel_name" ]; then
fi
groups=('base')
archs=('i686' 'x86_64')
-options=('nodocs')
+options=('nodocs' 'genscriptlet')
up2date="lynx -dump $url/kdist/finger_banner |sed -n 's/.*
\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'"
-source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_F_kernel_ver.tar.bz2
config)
-signatures=("${source[0]}.sign" '')
+if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then
+
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_F_kernel_ver.tar.bz2
config.i686 config.x86_64)
+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"
for i in [EMAIL PROTECTED]
@@ -188,8 +194,16 @@ if [ $_F_kernel_git -gt 0 ]; then
signatures=("[EMAIL PROTECTED]" ${source[$(([EMAIL PROTECTED]))]}.sign)
fi
-[ "$CARCH" == "x86_64" ] && MARCH=K8
-echo "$CARCH" |grep -q 'i.86' && KARCH=i386
+if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then
+ if [ "$CARCH" = "x86_64" ]; then
+ MARCH=K8
+ KARCH=x86
+ fi
+ echo "$CARCH" |grep -q 'i.86' && KARCH=x86
+else
+ [ "$CARCH" == "x86_64" ] && MARCH=K8
+ echo "$CARCH" |grep -q 'i.86' && KARCH=i386
+fi
###
# * subpkg()
@@ -226,17 +240,14 @@ fi
Fbuildkernel()
{
Fcd linux-$_F_kernel_ver
- cp $Fsrcdir/config .config
- if [ $_F_kernel_dontsedarch -eq 0 ]; then
- Fsed "486" "`echo ${MARCH:-$CARCH}|sed 's/^i//'`" .config
- fi
- if [ "$CARCH" = "x86_64" -a -z "$_F_kernel_manualamd64" ]; then
- echo -e "CONFIG_IA32_EMULATION=y
- CONFIG_IA32_AOUT=y
- CONFIG_COMPAT=y
- CONFIG_SYSVIPC_COMPAT=y
- CONFIG_UID16=y" >> .config
+ make clean || Fdie
+ if [ -e "$Fsrcdir/config.$CARCH" ]; then
+ cp $Fsrcdir/config.$CARCH .config || Fdie
+ else
+ cp $Fsrcdir/config .config || Fdie
fi
+
+
[ $_F_kernel_stable -gt 0 ] && Fpatch patch-$_F_kernel_ver.$_F_kernel_stable
[ $_F_kernel_rc -gt 0 ] && Fpatch patch-$_F_kernel_rcver
[ $_F_kernel_mm -gt 0 ] && Fpatch $_F_kernel_mmver
@@ -249,33 +260,35 @@ Fbuildkernel()
done
# remove unneded localversions
rm -f localversion-*
- if [ $_F_kernel_dontsedarch -eq 0 ]; then
+ ## FIXME: remove that after 0.8
+ if [ "$CARCH" = "x86_64" ]; then
yes "" | make config
else
make silentoldconfig || Fdie
fi
+ ## FIXME: remove or do it right -- crazy --
if [ $_F_kernel_dontfakeversion -eq 0 ]; then
Fsed "SUBLEVEL =.*" "SUBLEVEL = ${_F_kernel_ver#*.*.}" Makefile
Fsed "EXTRAVERSION =.*" "EXTRAVERSION = $_F_kernel_uname" Makefile
fi
-
+
## let we do kernel$_F_kernel_name-source before make
Fmkdir /usr/src
- cp -Ra $Fsrcdir/linux-$_F_kernel_ver
$Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname
- rm -rf
$Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname/{Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS}
+ cp -Ra $Fsrcdir/linux-$_F_kernel_ver
$Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname || Fdie
+ rm -rf
$Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname/{Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS}
|| Fdie
Fln linux-$_F_kernel_ver$_F_kernel_uname /usr/src/linux
Fsplit kernel$_F_kernel_name-source usr/src
## now the kernel$_F_kernel_name-docs
Fmkdir /usr/src/linux-$_F_kernel_ver$_F_kernel_uname
cp -Ra
$Fsrcdir/linux-$_F_kernel_ver/{Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS}
\
- $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname
+ $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname
|| Fdie
## do we need to ln /usr/share/doc ?!
Fsplit kernel$_F_kernel_name-docs usr/src
if [ -z "$_F_kernel_name" ]; then
- make INSTALL_HDR_PATH=$Fdestdir/usr headers_install
- Frm /usr/include/scsi
+ make INSTALL_HDR_PATH=$Fdestdir/usr headers_install || Fdie
+ [ -e $Fdestdir/usr/include/scsi ] && Frm /usr/include/scsi
Fsplit kernel-headers /usr
fi
## now time to eat some cookies and wait kernel got compiled :)
@@ -289,17 +302,20 @@ Fbuildkernel()
else
make || Fdie
fi
-
+
Fmkdir /boot
Ffilerel .config /boot/config-$_F_kernel_ver$_F_kernel_uname
if [ ! -z "$_F_kernel_vmlinuz" ]; then
Ffilerel $_F_kernel_vmlinuz /boot/vmlinuz-$_F_kernel_ver$_F_kernel_uname
else
- Ffilerel arch/${KARCH:-$CARCH}/boot/bzImage \
- /boot/vmlinuz-$_F_kernel_ver$_F_kernel_uname
+ if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then
+ Ffilerel arch/x86/boot/bzImage
/boot/vmlinuz-$_F_kernel_ver$_F_kernel_uname
+ else
+ Ffilerel arch/${KARCH:-$CARCH}/boot/bzImage
/boot/vmlinuz-$_F_kernel_ver$_F_kernel_uname
+ fi
fi
Fmkdir /lib/modules
- make INSTALL_MOD_PATH=$Fdestdir modules_install
+ make INSTALL_MOD_PATH=$Fdestdir modules_install || Fdie
# dump symol versions so that later builds will have dependencies and
# modversions
Ffilerel System.map /boot/System.map-$_F_kernel_ver$_F_kernel_uname
@@ -312,10 +328,10 @@ Fbuildkernel()
/lib/modules/$_F_kernel_ver$_F_kernel_uname/source
# scriptlets
- cp $Fincdir/kernel.install $Fsrcdir
+ cp $Fincdir/kernel.install $Fsrcdir || Fdie
Fsed '$_F_kernel_ver' "$_F_kernel_ver" $Fsrcdir/kernel.install
Fsed '$_F_kernel_uname' "$_F_kernel_uname" $Fsrcdir/kernel.install
- cp $Fincdir/kernel-source.install $Fsrcdir
+ cp $Fincdir/kernel-source.install $Fsrcdir || Fdie
Fsed '$_F_kernel_ver' "$_F_kernel_ver" $Fsrcdir/kernel-source.install
Fsed '$_F_kernel_uname' "$_F_kernel_uname" $Fsrcdir/kernel-source.install
Fsed '$_F_kernel_name' "$_F_kernel_name" $Fsrcdir/kernel-source.install
diff --git a/source/include/mono.sh b/source/include/mono.sh
index 1a4a973..5d3ddb9 100644
--- a/source/include/mono.sh
+++ b/source/include/mono.sh
@@ -31,6 +31,11 @@
# == PROVIDED FUNCTIONS
# * Fmonoexport(): creates MONO_SHARED_DIR
###
+
+if [ -z "$_F_mono_aot" ]; then
+ _F_mono_aot=1
+fi
+
Fmonoexport() {
Fmessage "Exporting weird MONO_SHARED_DIR..."
export MONO_SHARED_DIR=$Fdestdir/weird
@@ -64,7 +69,9 @@ Fbuild_mono() {
unset MAKEFLAGS
Fmonoexport
Fbuild
+if [ "$_F_mono_aot" -eq 1 ]; then
Fmonocompileaot
+fi
Fmonocleanup
}
diff --git a/source/include/openoffice-dict.sh
b/source/include/openoffice-dict.sh
index a6fa72f..985efd5 100644
--- a/source/include/openoffice-dict.sh
+++ b/source/include/openoffice-dict.sh
@@ -58,6 +58,12 @@ _F_openoffice_option() {
}
###
+# == APPENDED VARIABLES
+# * genscriptlet to options()
+###
+options=([EMAIL PROTECTED] 'genscriptlet')
+
+###
# == PROVIDED FUNCTIONS
# * Fopenoffice_dictbuild()
###
diff --git a/source/include/pear.sh b/source/include/pear.sh
index cb61135..1635496 100644
--- a/source/include/pear.sh
+++ b/source/include/pear.sh
@@ -37,7 +37,7 @@
# * install
###
pkgname=php-pear-`echo $_F_pear_name|tr [A-Z] [a-z]`
-pkgrel=1
+[ -z "$pkgrel" ] && pkgrel=1
url="http://pear.php.net/package/$_F_pear_name";
groups=('devel-extra')
archs=('i686' 'x86_64') # it's safe to add x86_64 by default
@@ -46,6 +46,12 @@ source=(http://pear.php.net/get/$_F_pear_name-$pkgver.tgz)
install=src/pear.install
###
+# == APPENDED VARIABLES
+# * genscriptlet to options()
+###
+options=([EMAIL PROTECTED] 'genscriptlet')
+
+###
# == PROVIDED FUNCTIONS
# * Fbuildpear()
###
@@ -53,6 +59,9 @@ Fbuildpear()
{
# install the package
pear install --nodeps -R $Fdestdir $_F_pear_name-$pkgver.tgz || Fdie
+ cd $Fdestdir/usr/share/pear
+ Fpatchall
+ cd - >/dev/null
# remove the common files, they will be updated by the scriptlet
Frm /usr/share/pear/{.channels,.registry,.depdb,.depdblock,.filemap,.lock} /tmp
# the package.xml is required to update the common files
diff --git a/source/include/perl.sh b/source/include/perl.sh
index f656df2..b564a13 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=([EMAIL PROTECTED] 'perl')
+depends=([EMAIL PROTECTED] 'perl>=5.10.0-2')
makedepends=([EMAIL PROTECTED] 'perl-libwww')
groups=('devel-extra')
archs=('i686')
diff --git a/source/include/scm.sh b/source/include/scm.sh
index 0915ab5..979b892 100644
--- a/source/include/scm.sh
+++ b/source/include/scm.sh
@@ -85,7 +85,7 @@ elif [ "$_F_scm_type" == "cvs" ]; then
up2date="date +%Y%m%d"
makedepends=([EMAIL PROTECTED] 'cvs')
elif [ "$_F_scm_type" == "subversion" ]; then
- up2date="svn log $_F_scm_url --limit=1 |sed -n '/^r/s/r\([0-9]\+\)
.*/\1/p'"
+ up2date="echo -n svn; svn log $_F_scm_url --limit=1 |sed -n
'/^r/s/r\([0-9]\+\) .*/\1/p'"
makedepends=([EMAIL PROTECTED] 'subversion')
elif [ "$_F_scm_type" == "git" ]; then
up2date="date +%Y%m%d%H%M%S --date '`curl -I $_F_scm_url/HEAD 2>&1|sed -n
'/^Last-Modified/s/^[^:]*: //p'`'"
diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh
index 7116e68..8bfcb42 100644
--- a/source/include/sourceforge.sh
+++ b/source/include/sourceforge.sh
@@ -39,11 +39,12 @@
# * _F_sourceforge_ext (defaults to .tar.gz): extension of the source tarball
# * _F_sourceforge_broken_up2date: if set, try an other method for up2date, try
# this if the normal up2date does not work, maybe this will
-# *_F_sourceforge_prefix (no defaults): used to correct the up2date output
+# * _F_sourceforge_prefix (no defaults): used to correct the up2date output
# As example $pkgver should be 1.2.3 but you get V1.2.3 in such a case you can
# set _F_sourceforge_prefix="V"
-# *_F_sourceforge_sep ( defaults to - ): used for source() only right now. As
example
-# for an "baz_1.2.3.tar.gz" tarball you should use _F_sourceforge_sep="_"
+# * _F_sourceforge_sep ( defaults to - ): used for source() only right now. As
example
+# for an "baz_1.2.3.tar.gz" tarball you should use _F_sourceforge_sep="_" ,
for empty
+# values use _F_sourceforge_sep="None" that way you can dowload such
foo1234.tgz
###
if [ -z "$_F_sourceforge_name" ]; then
_F_sourceforge_name=$pkgname
@@ -70,6 +71,9 @@ if [ -z "$_F_sourceforge_sep" ]; then
_F_sourceforge_sep="-"
fi
+if [ -n "$_F_sourceforge_sep" ] && [ "$_F_sourceforge_sep" = "None" ]; then
+ _F_sourceforge_sep=""
+fi
###
# == OVERWRITTEN VARIABLES
# * url
@@ -82,4 +86,4 @@ if [ $_F_sourceforge_broken_up2date -eq 0 ]; then
else
up2date="lynx -dump
http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep
showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1
'$_F_sourceforge_name\(.*\)$_F_sourceforge_ext'|sed
's/.*$_F_sourceforge_name$_F_sourceforge_prefix\(.*\)$_F_sourceforge_ext.*/\1/;s/-/_/g;s/_//1'"
fi
-source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$_F_sourceforge_name$_F_sourceforge_sep${pkgver//_/-}$_F_sourceforge_ext)
+source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/${_F_sourceforge_name}${_F_sourceforge_sep}${pkgver//_/-}${_F_sourceforge_ext})
diff --git a/source/include/texinfo.install b/source/include/texinfo.install
index edf425f..eb6664e 100644
--- a/source/include/texinfo.install
+++ b/source/include/texinfo.install
@@ -1,10 +1,15 @@
post_install()
{
- echo -n "generating the top-level Info node... "
- mkinfodir /usr/info > /usr/info/dir 2>/dev/null
+ echo -n "updating the top-level info node... "
+ mkinfodir /usr/share/info > /usr/share/info/dir 2>/dev/null
echo "done."
}
+post_remove()
+{
+ post_install
+}
+
op=$1
shift
diff --git a/source/include/texinfo.sh b/source/include/texinfo.sh
index 2935d80..41a8c09 100644
--- a/source/include/texinfo.sh
+++ b/source/include/texinfo.sh
@@ -31,3 +31,9 @@
# * install
###
install=$Fincdir/texinfo.install
+
+###
+# == APPENDED VARIABLES
+# * genscriptlet to options()
+###
+options=([EMAIL PROTECTED] 'genscriptlet')
diff --git a/source/include/util.sh b/source/include/util.sh
index b05e3c8..49344f8 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -82,12 +82,9 @@ Fsysconfdir="/etc"
Flocalstatedir="/var"
Fmenudir="/usr/share/applications"
Farchs=('i686' 'x86_64' 'ppc')
+Fbuildchost="`arch`-frugalware-linux"
Fconfopts="--prefix=$Fprefix"
-_gccver=`gcc -dumpversion`
-if [ "${_gccver%%.?}" == "4.2" ]; then
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
- export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-fi
+## Move to makepkg.conf for Kalgan+1
export LDFLAGS="-Wl,--hash-style=both"
###
@@ -321,7 +318,7 @@ Fman() {
local i
for i in $@
do
- Ffile /usr/share/man/man${i##*.}/$i
+ Ffile $i /usr/share/man/man${i##*.}/`basename $i`
done
}
@@ -333,7 +330,7 @@ Fmanrel() {
local i
for i in $@
do
- Ffilerel /usr/share/man/man${i##*.}/$i
+ Ffilerel $i /usr/share/man/man${i##*.}/`basename $i`
done
}
@@ -505,6 +502,8 @@ Fconf() {
Fconfopts="$Fconfopts --sysconfdir=$Fsysconfdir"
grep -q localstatedir $_F_conf_configure && \
Fconfopts="$Fconfopts --localstatedir=$Flocalstatedir"
+ grep -q 'build=' $_F_conf_configure && \
+ Fconfopts="$Fconfopts --build=$Fbuildchost"
$_F_conf_configure $Fconfopts "$@" || Fdie
elif [ -f Makefile.PL ]; then
if [ -z "$_F_conf_perl_pipefrom" ]; then
@@ -518,6 +517,8 @@ Fconf() {
ruby extconf.rb --prefix="$Fprefix" "$@" || Fdie
elif [ -f configure.rb ]; then
./configure.rb --prefix="$Fprefix" "$@" || Fdie
+ elif [ -f setup.rb ]; then
+ ruby setup.rb config "$@" || Fdie
fi
}
@@ -532,6 +533,8 @@ Fmake() {
make || Fdie
elif [ -f setup.py ]; then
python setup.py build "$@" || Fdie
+ elif [ -f setup.rb ]; then
+ ruby setup.rb setup "$@" || Fdie
else
Fmessage "No Makefile or setup.py found!"
Fdie
@@ -571,6 +574,8 @@ Fmakeinstall() {
fi
elif [ -f setup.py ]; then
python setup.py install --prefix "$Fprefix" --root "$Fdestdir" "$@" || Fdie
+ elif [ -f setup.rb ]; then
+ ruby setup.rb install --prefix=$Fdestdir || Fdie
else
Fmessage "No Makefile or setup.py found!"
Fdie
@@ -581,15 +586,15 @@ Fmakeinstall() {
if [ -e $Fdestdir/usr/share/info/dir ]; then
Frm /usr/share/info/dir
fi
- if [ -d $Fdestdir/usr/lib/perl5/?.?.? ]; then
- Fmv '/usr/lib/perl5/?.?.?' /usr/lib/perl5/current
+ if [ -d $Fdestdir/usr/lib/perl5/*.*.* ]; then
+ Fmv '/usr/lib/perl5/*.*.*' /usr/lib/perl5/current
fi
if [ -d $Fdestdir/usr/lib/perl5 ]; then
find $Fdestdir/usr/lib/perl5 -name perllocal.pod -exec rm {} \;
find $Fdestdir/usr/lib/perl5 -name .packlist -exec rm {} \;
fi
- if [ -e $Fdestdir/usr/lib/perl5/site_perl/?.?.? ]; then
- Fmv '/usr/lib/perl5/site_perl/?.?.?'
/usr/lib/perl5/site_perl/current
+ if [ -e $Fdestdir/usr/lib/perl5/site_perl/*.*.* ]; then
+ Fmv '/usr/lib/perl5/site_perl/*.*.*'
/usr/lib/perl5/site_perl/current
fi
if [ -d $Fdestdir/usr/lib/perl5/site_perl ]; then
find $Fdestdir/usr/lib/perl5/site_perl -name perllocal.pod -exec rm {} \;
@@ -808,39 +813,51 @@ Fautoreconf() {
}
###
-# * Flastarchive: Extracts version from a page's last archive.
-# Extension of the archive is given as argument.
+# * Flastarchive: Extracts last archive version from a page. Parameters: 1)
+# url (optional) of the page, else stdin if not present 2) extension_filter
+# for the archive type
###
Flastarchive() {
if [ -z "$_F_archive_name" ]; then
_F_archive_name="$pkgname"
fi
- if [ -z "$_F_archive_nosort" ]; then
- sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" |
Fsort | tail -n1
+ if [ $# -gt 1 ]; then
+ lynx -dump $1 | Flastarchive $2
else
- sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" |
tail -n1
+ if [ -z "$_F_archive_nosort" ]; then
+ sed -n
"s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1
+ else
+ sed -n
"s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | tail -n1
+ fi
fi
}
###
-# * Flasttar(): Extracts version from a page's last tar.gz link.
+# * Flasttar(): A convenience function to Flastarchive for all the known tar
+# ball extension. Parameters: 1) url (optional) see Flastarchive
###
Flasttar() {
- Flastarchive '\.tar\(\.gz\|\.bz2\)\?\|\.tgz'
+ Flastarchive $1 '\.tar\(\.gz\|\.bz2\)\?\|\.tgz'
}
###
-# * Flasttgz(): Extracts version from a page's last tgz link.
+# * Flasttgz(): A convenience function to Flastarchive for the tgz extension.
+# Parameters: 1) url (optional) see Flastarchive
+#
+# NOTE: this function is obsolete, use Flasttar instead.
###
Flasttgz() {
- Flastarchive '\.tgz'
+ Flastarchive $1 '\.tgz'
}
###
-# * Flasttarbz2(): Extracts version from a page's last tar.bz2 link.
+# * Flasttarbz2(): A convenience function to Flastarchive for the tar.bz2
+# extension. Parameters: 1) url (optional) see Flastarchive
+#
+# NOTE: this function is obsolete, use Flasttar instead.
###
Flasttarbz2() {
- Flastarchive '\.tar\.bz2'
+ Flastarchive $1 '\.tar\.bz2'
}
###
@@ -848,7 +865,7 @@ Flasttarbz2() {
##
Fup2gnugz()
{
- up2date="lynx -dump 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|Flasttar"
+ up2date="Flasttar 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'"
}
###
@@ -856,7 +873,7 @@ Fup2gnugz()
##
Fup2gnubz2()
{
- up2date="lynx -dump
'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'|Flasttarbz2"
+ up2date="Flasttarbz2 'http://ftp.gnu.org/gnu/$pkgname/?C=M;O=A'"
}
###
@@ -952,7 +969,7 @@ MimeType=$dmime
EOF
if [ ! -z $_F_desktop_show_in ] ; then
- echo "OnlyShowIn=$dshowin;" >>
$Fdestdir$Fmenudir/$pkgname.desktop
+ echo "OnlyShowIn=$dshowin;" >> $Fdestdir$Fmenudir/$deskfilename
fi
}
@@ -1071,7 +1088,7 @@ Fextract() {
cmd="tar --use-compress-program=bzip2 -xf $file" ;;
*.tar)
cmd="tar -xf $file" ;;
- *.zip)
+ *.zip|*.xpi)
unziphack=1
cmd="unzip -qqo $file" ;;
*.cpio.gz)
@@ -1082,6 +1099,8 @@ Fextract() {
cmd="gunzip -f $file" ;;
*.bz2)
cmd="bunzip2 -f $file" ;;
+ *.7z)
+ cmd="7z x $file" ;;
*)
cmd="" ;;
esac
diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh
index 78505e0..94ee136 100644
--- a/source/include/xfce4.sh
+++ b/source/include/xfce4.sh
@@ -44,22 +44,27 @@ if [ -z $_F_xfce_goodies_dir ] ; then
_F_xfce_goodies_dir=$_F_xfce_name
fi
+if [ -z $_F_archive_name ] ; then
+ _F_archive_name=$_F_xfce_name
+fi
+
###
# == OVERWRITTEN VARIABLES
# * url
# * up2date
# * source()
###
+
if echo ${groups[*]} | grep -q goodies ; then
url="http://goodies.xfce.org/projects/panel-plugins/${_F_xfce_name}";
dlurl="http://goodies.xfce.org/releases/$_F_xfce_goodies_dir/";
- up2date="lynx -dump $dlurl | grep
"$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'"
+ up2date="lynx -dump $dlurl | grep
"$_F_xfce_name-.*${_F_xfce_goodies_ext}$" | Flasttar"
source=($dlurl/${_F_xfce_name}-${pkgver}${_F_xfce_goodies_ext})
else
url="http://www.xfce.org/";
preup2date="lynx -dump http://www.xfce.org/archive/ | grep xfce- | tail -n1 |
sed 's/.*-\(.*\)\/.*/\1/'"
- dlurl="$url/archive/xfce-4.4.1/src"
- up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | grep
$_F_xfce_name | Flasttarbz2"
+ dlurl="$url/archive/xfce-4.4.2/src"
+ up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | Flasttar"
source=($dlurl/$_F_xfce_name-$pkgver.tar.bz2)
fi
diff --git a/source/include/xorg.sh b/source/include/xorg.sh
index 3df4d48..fe50e0b 100644
--- a/source/include/xorg.sh
+++ b/source/include/xorg.sh
@@ -21,7 +21,6 @@
# archs=('i686' 'x86_64')
# depends=('xorg-server')
# makedepends=('xproto' 'randrproto' 'renderproto')
-# _F_xorg_nr=1
# Finclude xorg
# sha1sums=('349572d92ca6cd2c8f370105c4bffc70b7034bf3')
# --------------------------------------------------
@@ -30,9 +29,8 @@
# * _F_xorg_name (defaults to $pkgname): if you want to use a custom package
# name (for example the upstream name contains uppercase letters) then use this
# to declare the real name
-# * _F_xorg_nr: X, where the xorg version of the package is 7.X (choose the
-# largest possible, sometimes packages are not available in the latest
-# directory)
+# * _F_xorg_ind (defaults to ""): if set, use the individual folder, not the
+# release one
###
if [ -z "$_F_xorg_name" ]; then
_F_xorg_name=$pkgname
@@ -59,30 +57,28 @@ if [[ $pkgname =~ ^xf86-input- ]]; then
pkgdesc="X.Org driver for ${pkgname#xf86-input-} input devices"
groups=('x11' 'xorg-core' 'xorg-drivers')
archs=('i686' 'x86_64')
- depends=('xorg-server')
+ depends=('xorg-server>=1.4.0.90')
makedepends=('inputproto' 'randrproto')
fi
url="http://xorg.freedesktop.org";
-if [ -n "$_F_xorg_nr" ]; then
- _F_xorg_release_dir="X11R7.2/src"
-else
+
+# set individual to be 1 , released xorg is crap at the moment , no way to get
something
+# usable from there.
+_F_xorg_ind=1
+
+if [ "$_F_xorg_ind" -eq 1 ]; then
_F_xorg_release_dir="individual"
+else
+ _F_xorg_release_dir="X11R7.3/src"
fi
+
_F_xorg_dir=`echo ${groups[$(([EMAIL PROTECTED]))]}|sed
's/xorg-\(.*\)/\1/;s/s$//'`
_F_xorg_version="X11R7."
[ "$_F_xorg_name" = "xorg-server" ] && _F_xorg_dir="xserver"
_F_xorg_url="$url/releases/$_F_xorg_release_dir/$_F_xorg_dir/"
license="GPL2"
-if [ -n "$_F_xorg_nr" ]; then
- up2date="lynx -dump $_F_xorg_url | grep
'$_F_xorg_name-${_F_xorg_version}$_F_xorg_nr-\(.*\).tar.bz2'|sed -n
's/.*$_F_xorg_name-$_F_xorg_version$_F_xorg_nr-\(.*\)\.t.*/\1/;$ p'"
-
source=($_F_xorg_url/$_F_xorg_name-$_F_xorg_version$_F_xorg_nr-$pkgver.tar.bz2)
- if [ -z "$_F_cd_path" ]; then
- _F_cd_path="$_F_xorg_name-$_F_xorg_version$_F_xorg_nr-$pkgver"
- fi
-else
- up2date="lynx -dump $_F_xorg_url | grep
'$_F_xorg_name-\(.*\).tar.bz2'|sed -n 's/.*$_F_xorg_name-\(.*\)\.t.*/\1/;$ p'"
- source=($_F_xorg_url/$_F_xorg_name-$pkgver.tar.bz2)
- if [ -z "$_F_cd_path" ]; then
- _F_cd_path="$_F_xorg_name-$pkgver"
- fi
+up2date="lynx -dump '$_F_xorg_url/?C=M;O=A' | grep
'$_F_xorg_name-\(.*\).tar.bz2'|sed -n 's/.*$_F_xorg_name-\(.*\)\.t.*/\1/;$ p'"
+source=($_F_xorg_url/$_F_xorg_name-$pkgver.tar.bz2)
+if [ -z "$_F_cd_path" ]; then
+ _F_cd_path="$_F_xorg_name-$pkgver"
fi
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
