[Frugalware-git] frugalware-current: Revert util.sh

[Michel Hermier]

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

commit 8d9f797af8e8044f3af23e2fd6826319d088d2e0
Author: Michel Hermier herm...@frugalware.org
Date:   Fri Dec 11 15:59:09 2009 +0100

Revert util.sh

This reverts commit 64bddb1a5cfcf30bd94928fc7cc07f6b8824139b.

* Reverted because it contained stuff that I wanted to commit later and
separately.

diff --git a/source/include/util.sh b/source/include/util.sh
index b6e98b5..bc2d18b 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
@@ -489,7 +487,6 @@ Fpatch() {
else
i=$1
fi
-   sed 's/\r$//' $Fsrcdir/$i  $Fsrcdir/$i
if patch -Np0 --dry-run -i $Fsrcdir/$i /dev/null  \
! patch -Np1 --dry-run -i $Fsrcdir/$i /dev/null; then
level=0
@@ -909,7 +906,6 @@ Fsanitizeversion() {
if [ $# -gt 0 ]; then
echo $1 | Fsanitizeversion
else
-   # _F_archive_prefix place is questionable
sed s/%2B/+/g;s/$pkgextraver$//;s/$_F_archive_prefix//;s/-/_/g
fi
}
@@ -1236,12 +1232,3 @@ Fextract() {
fi
fi
}
-
-###
-# * Futil_genscriptlet_hook(): the genscriplet hook for the util.sh variables.
-###
-Futil_genscriptlet_hook()
-{
-   Fsed '$pkgname' $pkgname $1
-   Fsed '$pkgver' $pkgver $1
-}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: Revert util.sh

[Michel Hermier]

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

commit 8d9f797af8e8044f3af23e2fd6826319d088d2e0
Author: Michel Hermier herm...@frugalware.org
Date:   Fri Dec 11 15:59:09 2009 +0100

Revert util.sh

This reverts commit 64bddb1a5cfcf30bd94928fc7cc07f6b8824139b.

* Reverted because it contained stuff that I wanted to commit later and
separately.

diff --git a/source/include/util.sh b/source/include/util.sh
index b6e98b5..bc2d18b 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
@@ -489,7 +487,6 @@ Fpatch() {
else
i=$1
fi
-   sed 's/\r$//' $Fsrcdir/$i  $Fsrcdir/$i
if patch -Np0 --dry-run -i $Fsrcdir/$i /dev/null  \
! patch -Np1 --dry-run -i $Fsrcdir/$i /dev/null; then
level=0
@@ -909,7 +906,6 @@ Fsanitizeversion() {
if [ $# -gt 0 ]; then
echo $1 | Fsanitizeversion
else
-   # _F_archive_prefix place is questionable
sed s/%2B/+/g;s/$pkgextraver$//;s/$_F_archive_prefix//;s/-/_/g
fi
}
@@ -1236,12 +1232,3 @@ Fextract() {
fi
fi
}
-
-###
-# * Futil_genscriptlet_hook(): the genscriplet hook for the util.sh variables.
-###
-Futil_genscriptlet_hook()
-{
-   Fsed '$pkgname' $pkgname $1
-   Fsed '$pkgver' $pkgver $1
-}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git