[Frugalware-git] imgrebuild: pinentry-0.8.0-2-i686

2010-04-27 Thread Michel Hermier
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=e2d98e92abc8a13df2fb30e5335bd97f289d4c72

commit e2d98e92abc8a13df2fb30e5335bd97f289d4c72
Author: Michel Hermier herm...@frugalware.org
Date:   Tue Apr 27 18:03:24 2010 +0200

pinentry-0.8.0-2-i686

* Rebuild with new libs.
* Remove gtk+ and qt frontend in favor of gtk+2 and qt4 ones.

diff --git a/source/apps-extra/metapixel/FrugalBuild 
b/source/apps-extra/metapixel/FrugalBuild
index 1764ac4..dfd0408 100644
--- a/source/apps-extra/metapixel/FrugalBuild
+++ b/source/apps-extra/metapixel/FrugalBuild
@@ -3,21 +3,20 @@

pkgname=metapixel
pkgver=1.0.2
-pkgrel=1
+pkgrel=2
pkgdesc=a program for generating photomosaics
url=http://www.complang.tuwien.ac.at/~schani/metapixel/;
-depends=('libpng' 'libjpeg' 'libungif')
+depends=('libpng' 'libjpeg' 'libgif')
rodepends=('perl')
groups=('apps-extra')
archs=('i686' 'x86_64')
-up2date=lynx -dump 'http://www.complang.tuwien.ac.at/~schani/metapixel/'|grep 
tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'
+up2date=Flasttar 'http://www.complang.tuwien.ac.at/~schani/metapixel/'
source=(http://www.complang.tuwien.ac.at/~schani/$pkgname/files/$pkgname-$pkgver.tar.gz)
sha1sums=('f917aec91430b1bdbcc7b3dea29cb93f15a04c77')

build()
{
Fsed /usr/local $Fdestdir/usr  Makefile
-   Fsed -lgif -lungif Makefile
Fsed share/man man Makefile
Fsed OPTIMIZE = -O2 OPTIMIZE = ${CFLAGS} Makefile
Fmkdir /usr/man/man1
diff --git a/source/apps-extra/pinentry/FrugalBuild 
b/source/apps-extra/pinentry/FrugalBuild
index ac983a0..f43a6ac 100644
--- a/source/apps-extra/pinentry/FrugalBuild
+++ b/source/apps-extra/pinentry/FrugalBuild
@@ -3,62 +3,51 @@

pkgname=pinentry
pkgver=0.8.0
-pkgrel=1
+pkgrel=2
pkgdesc=Applications for entering PINs or Passphrases.
url=http://ftp.gnupg.org/gcrypt/pinentry/;
depends=('libcap' 'ncurses')
groups=('apps-extra')
archs=('i686' 'x86_64')
Finclude texinfo
-up2date=lynx -dump ftp://ftp.gnupg.org/gcrypt/pinentry/ |grep pinentry.*tar 
|sed -e 's/.*y-\(.*\)\.t.*/\1/;s/-/_/' |sort -r |sed -n -e '1 p'
+up2date=Flasttar ftp://ftp.gnupg.org/gcrypt/pinentry/;
source=(ftp://ftp.gnupg.org/gcrypt/pinentry/$pkgname-$pkgver.tar.gz)
options=('scriptlet')
signatures=($source.sig)

-subpkgs=(${subpk...@]} $pkgname-gtk+)
-subdescs=(${subdes...@]} GTK+ based Applications for entering PINs or 
Passphrases.)
-subdepends=(${subdepen...@]} gtk+)
-subrodepends=(${subrodepen...@]} $pkgname=$pkgver)
-subgroups=(${subgrou...@]} 'xapps-extra')
-subarchs=(${subarc...@]} 'i686 x86_64')
-
subpkgs=(${subpk...@]} $pkgname-gtk+2)
subdescs=(${subdes...@]} GTK+2 based Applications for entering PINs or 
Passphrases.)
-subdepends=(${subdepen...@]} gtk+2)
-subrodepends=(${subrodepen...@]} $pkgname=$pkgver)
-subgroups=(${subgrou...@]} 'xapps-extra')
-subarchs=(${subarc...@]} 'i686 x86_64')
-
-subpkgs=(${subpk...@]} $pkgname-qt)
-subdescs=(${subdes...@]} Qt3 based Applications for entering PINs or 
Passphrases.)
-subdepends=(${subdepen...@]} qt)
+subdepends=(${subdepen...@]} gtk+2=2.20.0-2)
subrodepends=(${subrodepen...@]} $pkgname=$pkgver)
subgroups=(${subgrou...@]} 'xapps-extra')
subarchs=(${subarc...@]} 'i686 x86_64')
+subconflicts=(${subconflic...@]} $pkgname-gtk+)
+subreplaces=(${subreplac...@]} $pkgname-gtk+)
+subprovides=(${subprovid...@]} $pkgname-gtk+)

subpkgs=(${subpk...@]} $pkgname-qt4)
subdescs=(${subdes...@]} Qt4 based Applications for entering PINs or 
Passphrases.)
-subdepends=(${subdepen...@]} libqtgui=4.6.1 libice libxrender libxext 
ncurses libcap libgcc libuuid)
+subdepends=(${subdepen...@]} libqtgui=4.6.2-3 libice libxrender libxext 
ncurses libcap libgcc libuuid)
subrodepends=(${subrodepen...@]} $pkgname=$pkgver)
subgroups=(${subgrou...@]} 'xapps-extra')
subarchs=(${subarc...@]} 'i686 x86_64')
+subconflicts=(${subconflic...@]} $pkgname-qt)
+subreplaces=(${subreplac...@]} $pkgname-qt)
+subprovides=(${subprovid...@]} $pkgname-qt)

build()
{
-   Fcd
-   ## brr
-   for i in qt4/*.moc
-   do
-   /usr/bin/moc ${i/.moc/.h}  ${i} || Fdie
-   done
-
Fbuild
Fln pinentry-curses $Fprefix/bin/pinentry

-   Fsplit pinentry-gtk+ usr/bin/pinentry-gtk
Fsplit pinentry-gtk+2 usr/bin/pinentry-gtk-2
-   Fsplit pinentry-qt usr/bin/pinentry-qt
Fsplit pinentry-qt4 usr/bin/pinentry-qt4
+
+   # Compatibility
+   Fln pinentry-gtk-2 $Fprefix/bin/pinentry-gtk
+   Fsplit pinentry-gtk+2 usr/bin/pinentry-gtk
+   Fln pinentry-qt4 $Fprefix/bin/pinentry-qt
+   Fsplit pinentry-qt4 usr/bin/pinentry-qt
}

# optimization OK
diff --git a/source/games-extra/smc/FrugalBuild 
b/source/games-extra/smc/FrugalBuild
index b8a1172..6843733 100644
--- a/source/games-extra/smc/FrugalBuild
+++ b/source/games-extra/smc/FrugalBuild
@@ -3,14 +3,14 @@

pkgname=smc
pkgver=1.9
-pkgrel=1
+pkgrel=2
pkgdesc=Secret Maryo Chronicles
_F_sourceforge_ext=.tar.bz2
_F_sourceforge_dirname=smclone
_F_sourceforge_realname=Secret Maryo Chronicles
Finclude sourceforge
url=http://www.secretmaryo.org/;

[Frugalware-git] imgrebuild: pinentry-0.8.0-2-i686

2010-04-27 Thread Michel Hermier
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=a815f2505384652a80d83cd6bf24533d9315a481

commit a815f2505384652a80d83cd6bf24533d9315a481
Author: Michel Hermier herm...@frugalware.org
Date:   Tue Apr 27 18:10:04 2010 +0200

pinentry-0.8.0-2-i686

* This partially reverts commit e2d98e92abc8a13df2fb30e5335bd97f289d4c72.
Remove local extra packages changes.

diff --git a/source/apps-extra/metapixel/FrugalBuild 
b/source/apps-extra/metapixel/FrugalBuild
index dfd0408..1764ac4 100644
--- a/source/apps-extra/metapixel/FrugalBuild
+++ b/source/apps-extra/metapixel/FrugalBuild
@@ -3,20 +3,21 @@

pkgname=metapixel
pkgver=1.0.2
-pkgrel=2
+pkgrel=1
pkgdesc=a program for generating photomosaics
url=http://www.complang.tuwien.ac.at/~schani/metapixel/;
-depends=('libpng' 'libjpeg' 'libgif')
+depends=('libpng' 'libjpeg' 'libungif')
rodepends=('perl')
groups=('apps-extra')
archs=('i686' 'x86_64')
-up2date=Flasttar 'http://www.complang.tuwien.ac.at/~schani/metapixel/'
+up2date=lynx -dump 'http://www.complang.tuwien.ac.at/~schani/metapixel/'|grep 
tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'
source=(http://www.complang.tuwien.ac.at/~schani/$pkgname/files/$pkgname-$pkgver.tar.gz)
sha1sums=('f917aec91430b1bdbcc7b3dea29cb93f15a04c77')

build()
{
Fsed /usr/local $Fdestdir/usr  Makefile
+   Fsed -lgif -lungif Makefile
Fsed share/man man Makefile
Fsed OPTIMIZE = -O2 OPTIMIZE = ${CFLAGS} Makefile
Fmkdir /usr/man/man1
diff --git a/source/games-extra/smc/FrugalBuild 
b/source/games-extra/smc/FrugalBuild
index 6843733..b8a1172 100644
--- a/source/games-extra/smc/FrugalBuild
+++ b/source/games-extra/smc/FrugalBuild
@@ -3,14 +3,14 @@

pkgname=smc
pkgver=1.9
-pkgrel=2
+pkgrel=1
pkgdesc=Secret Maryo Chronicles
_F_sourceforge_ext=.tar.bz2
_F_sourceforge_dirname=smclone
_F_sourceforge_realname=Secret Maryo Chronicles
Finclude sourceforge
url=http://www.secretmaryo.org/;
-depends=('sdlimage' 'sdl_ttf' 'sdl_gfx=2.0.19' 'sdl_mixer' 'cegui=0.7.1' 
'libboost-mt=1.37.0' 'freeglut' 'sdl')
+depends=('sdlimage' 'sdl_ttf' 'sdl_gfx=2.0.19' 'sdl_mixer' 'cegui=0.5.0b-3' 
'libboost-mt=1.37.0' 'freeglut' 'sdl')
rodepends=('smc-music')
makedepends=('boost=1.37.0')
groups=('games-extra')
diff --git a/source/gnome-extra/zapping/FrugalBuild 
b/source/gnome-extra/zapping/FrugalBuild
index 2495d3f..1b8d6ba 100644
--- a/source/gnome-extra/zapping/FrugalBuild
+++ b/source/gnome-extra/zapping/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=zapping
pkgver=0.10cvs6
-pkgrel=7
+pkgrel=6
pkgdesc=Zapping is a TV viewer
license=GPL
-depends=('libgnomeui' 'libxxf86vm' 'libxmu' 'rte' 'libxv' 'atk' 'freetype2' 
'pango' 'zvbi=0.2.33-2' 'libxxf86dga' 'perl-xml-parser' 'dbus-glib=0.71' 
'python=2.6')
+depends=('libgnomeui' 'libxxf86vm' 'libxmu' 'rte' 'libxv' 'atk' 'freetype2' 
'pango' 'zvbi' 'libxxf86dga' 'perl-xml-parser' 'dbus-glib=0.71' 'python=2.6')
makedepends=('rarian')
archs=('i686' '!x86_64')
groups=('gnome-extra')
diff --git a/source/gnustep-extra/gnustep-gui/FrugalBuild 
b/source/gnustep-extra/gnustep-gui/FrugalBuild
index 0d69537..8988387 100644
--- a/source/gnustep-extra/gnustep-gui/FrugalBuild
+++ b/source/gnustep-extra/gnustep-gui/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=gnustep-gui
pkgver=0.16.0
-pkgrel=2
+pkgrel=1
pkgdesc=The GNUstep GUI Library
Finclude gnustep
-depends=(${depen...@]} 'gnustep-base=1.18.0' 'audiofile=0.2.6-3' 'aspell' 
'libcups' \
-   'libgif' 'libjpeg' 'libpng' 'libtiff' 'libpng' 'libffi')
+depends=(${depen...@]} 'gnustep-base=1.18.0' 'libungif' 'aspell' 'libcups' \
+   'audiofile=0.2.6-3' 'libjpeg=6b-6' 'libtiff' 'libpng=1.2.37' 
'libffi')
groups=(${grou...@]} 'gnustep-core')
archs=('i686' 'x86_64')
sha1sums=('cc0a14f700a3736b8e4113d3ad80ed6f979d60be')
diff --git a/source/multimedia-extra/swftools/FrugalBuild 
b/source/multimedia-extra/swftools/FrugalBuild
index 577adcc..0d05e25 100644
--- a/source/multimedia-extra/swftools/FrugalBuild
+++ b/source/multimedia-extra/swftools/FrugalBuild
@@ -3,14 +3,14 @@

pkgname=swftools
pkgver=0.9.0
-pkgrel=3
+pkgrel=2
pkgdesc=A collection of SWF manipulation and creation utilities
archs=('i686')
url=http://www.swftools.org/;
-depends=('avifile' 'libgif' 'freeglut' 'lame' 't1lib' 'xpdf')
+depends=('avifile' 'libungif' 'freeglut' 'lame' 't1lib' 'xpdf')
makedepends=('bison' 'flex')
groups=('multimedia-extra')
-up2date=iFlasttar $url/download.html
+up2date=lynx -dump $url/download.html |grep [0-9].[0-9].[0-9].tar.gz | 
Flasttar
source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz \
swftools-cont-gcc44.patch)
sha1sums=('4860edc9f05e3cc5a55779aac3787cb0150146a8' \
diff --git a/source/x11-extra/windowmaker/FrugalBuild 
b/source/x11-extra/windowmaker/FrugalBuild
index f48bc4b..1f9772e 100644
--- a/source/x11-extra/windowmaker/FrugalBuild
+++ b/source/x11-extra/windowmaker/FrugalBuild
@@ -8,8 +8,8 @@ pkgrel=6
pkgdesc=An X11 window manager originally designed to provide integration 
support for the GNUstep Desktop Environment.
pkgdesc_localized=('hu_HU Egy, eredetileg a