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 GNUstep grafikus környezethez hasonló X11 ablakkezelõ.') url="http://www.windowmaker.info/"; -depends=('libxinerama>=1.0.3' 'libxft>=2.1.13-2' 'libxcb>=1.3' \ - 'libpng>=1.4.1' 'libjpeg>=8a' 'libgif>=4.1.6' 'libtiff>=3.9.2' 'libxpm>=3.5.7-2') +depends=('libxinerama>=1.0.3' 'libxft>=2.1.13-2' 'libxcb>=1.3' 'libtiff>=3.9.2' \ + 'libxpm>=3.5.7-2' 'libpng>=1.4.1' 'libjpeg>=8a' 'libgif>=4.1.6') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://windowmaker.info/pub/source/release/ | Flasttar" diff --git a/source/xapps-extra/latex2html/FrugalBuild b/source/xapps-extra/latex2html/FrugalBuild index 6fb8e1d..e54ebaf 100644 --- a/source/xapps-extra/latex2html/FrugalBuild +++ b/source/xapps-extra/latex2html/FrugalBuild @@ -4,10 +4,10 @@ pkgname=latex2html pkgver=2002_2_1 -pkgrel=7 +pkgrel=6 pkgdesc="A converter written in Perl that converts LaTeX documents to HTML." url="http://saftsack.fs.uni-bayreuth.de/~latex2ht/"; -depends=('perl' 'ghostscript' 'tetex' 'libgif' 'libpng' 'netpbm') +depends=('perl' 'ghostscript' 'tetex' 'libpng' 'libungif' 'netpbm') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') diff --git a/source/xapps-extra/mtpaint/FrugalBuild b/source/xapps-extra/mtpaint/FrugalBuild index 869078b..d3f6a77 100644 --- a/source/xapps-extra/mtpaint/FrugalBuild +++ b/source/xapps-extra/mtpaint/FrugalBuild @@ -4,11 +4,11 @@ pkgname=mtpaint pkgver=3.31 -pkgrel=3 +pkgrel=2 pkgdesc="mtPaint is a simple GTK2 painting program designed for creating icons and pixel based artwork." _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -depends=('freetype2' 'gtk+2>=2.16.2-2' 'glibc' 'libxau>=1.0.4' 'libxdmcp' 'libice' 'libxdamage' 'libxext' 'libxml2' 'libgif' 'libpng') +depends=('libungif' 'freetype2' 'gtk+2>=2.16.2-2' 'glibc' 'libxau>=1.0.4' 'libxdmcp' 'libice' 'libxdamage' 'libxext' 'libxml2' 'libpng') groups=('xapps-extra') options=('scriptlet') archs=('i686' 'x86_64') diff --git a/source/xapps-extra/vice/FrugalBuild b/source/xapps-extra/vice/FrugalBuild index 192dbae..7f5d020 100644 --- a/source/xapps-extra/vice/FrugalBuild +++ b/source/xapps-extra/vice/FrugalBuild @@ -9,15 +9,15 @@ pkgname=vice pkgver=2.1 -pkgrel=3 +pkgrel=2 pkgdesc="Versatile Commodore Emulator." url="http://www.viceteam.org/"; depends=('esd' 'libxv' 'libstdc++' 'readline' 'libxaw' \ - 'libxt' 'bdftopcf' 'mkfontdir' 'libgif' 'libjpeg' 'libpng') + 'libpng' 'libxt' 'bdftopcf' 'mkfontdir' 'libjpeg' 'libungif') makedepends=('xproto') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="Flasttar 'http://www.viceteam.org/'" +up2date="lynx --dump 'http://www.viceteam.org/' | grep tar.gz$ | sed -ne 's/.*vice-\(.*\)\.tar.gz/\1/;1 p'" source=(ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/$pkgname-$pkgver.tar.gz \ vice-2.1-gcc44.patch) sha1sums=('0adf7a1d13c7b3af7b8d2d21c17b6dc0f055ff67' \ diff --git a/source/xapps-extra/xawtv/FrugalBuild b/source/xapps-extra/xawtv/FrugalBuild index 29ec3b0..96cf3cd 100644 --- a/source/xapps-extra/xawtv/FrugalBuild +++ b/source/xapps-extra/xawtv/FrugalBuild @@ -3,12 +3,12 @@ pkgname=xawtv pkgver=3.95 -pkgrel=8 +pkgrel=6 pkgdesc="A TV application for the bttv driver." url="http://linux.bytesex.org/xawtv"; license="GPL" -depends=('tv-fonts' 'libdv' 'alsa-lib' 'libjpeg' 'libfs' 'aalib' 'libxrandr' 'libxv' 'libxinerama' 'zvbi>=0.2.33-2' 'libxaw' \ - 'openmotif' 'libxxf86dga>=1.0.2-2' 'libgl' 'libfs' 'libquicktime') +depends=('tv-fonts' 'libdv' 'alsa-lib' 'libjpeg' 'libfs' 'aalib' 'libxrandr' 'libxv' 'libxinerama' 'zvbi' 'libxaw' \ + 'openmotif' 'libxxf86dga>=1.0.2-2' 'libgl>=7.4.4' 'libfs' 'libquicktime') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://dl.bytesex.org/releases/xawtv/|grep $pkgname-[0-9\.]*\.tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild index 7c0f14d..0183f1f 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -5,12 +5,12 @@ pkgname=emacs pkgver=23.1 pkgextraver= -pkgrel=2 +pkgrel=1 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/"; Finclude texinfo makedepends=('libxaw') -depends=('xaw3d' 'libgif' 'libtiff' 'libjpeg' 'libpng' 'ncurses' 'libxcb' 'gtk+2') +depends=('xaw3d' 'libtiff' 'libjpeg' 'libpng' 'libungif' 'ncurses' 'libxcb' 'gtk+2') options=('scriptlet') _F_gnome_desktop="y" _F_gnome_iconcache="y" diff --git a/source/xapps/fontforge/FrugalBuild b/source/xapps/fontforge/FrugalBuild index 6ac4382..6cd92b2 100644 --- a/source/xapps/fontforge/FrugalBuild +++ b/source/xapps/fontforge/FrugalBuild @@ -3,13 +3,13 @@ pkgname=fontforge pkgver=20090923 -pkgrel=2 +pkgrel=1 pkgdesc="Font editor and converter" _F_sourceforge_ext=".tar.bz2" _F_sourceforge_name=fontforge_full Finclude sourceforge url="http://fontforge.sourceforge.net"; -depends=('libxi>=1.2.1-1' 'libxkbui>=1.0.2-3' 'libuninameslist' 'freetype2' 'libgif' 'libjpeg' 'libpng' 'libtiff') +depends=('libxi>=1.2.1-1' 'libxkbui>=1.0.2-3' 'libuninameslist' 'libtiff' 'libjpeg' 'freetype2' 'libpng' 'libungif') groups=('xapps' 'misc-fonts') archs=('i686' 'x86_64') source=(${source/fontforge-/fontforge_full-} $url/cidmaps.tgz) diff --git a/source/xapps/imagemagick/FrugalBuild b/source/xapps/imagemagick/FrugalBuild index 51b33b3..60ebefa 100644 --- a/source/xapps/imagemagick/FrugalBuild +++ b/source/xapps/imagemagick/FrugalBuild @@ -3,28 +3,27 @@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=imagemagick -_F_archive_name=ImageMagick pkgver=6.6.1_5 pkgrel=1 pkgdesc="A robust collection of tools and libraries to read, write and manipulate image files." url="http://www.imagemagick.org"; depends=('lcms' 'libxext' 'libxt' 'bzip2' 'libgcc' 'libgomp' 'expat' 'libx11>=1.2.1' 'djvulibre' 'libgomp' 'fontconfig' 'freetype2' \ - 'libpng>=1.4.1' 'openexr' 'jasper>=1.900.1-5') + 'libpng>=1.4.1' 'openexr' 'jasper') # FIXME - librsvg , GS makedepends=('mpeg2dec' 'graphviz' 'libtool') groups=('xapps') replaces=('perl-image-magick') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') -up2date="Flasttar ftp://ftp.imagemagick.net/pub/ImageMagick/"; -source=(ftp://ftp.imagemagick.net/pub/ImageMagick/$_F_archive_name-${pkgver/_/-}.tar.bz2 \ +up2date="lynx -dump ftp://ftp.imagemagick.net/pub/ImageMagick/ | grep \"[0-9\.-]\+.tar.bz2\" | tail -n 1 | sed \"s/.*ImageMagick-\(.*\).tar.bz2.*/\1/\" | tr '-' '_'" +source=(ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-`echo $pkgver | tr '_' '-'`.tar.bz2 \ libpng_mmx_patch_x86_64.patch) sha1sums=('cd12d1a62efef9cce94b4df332d8e3d8cc40d5d7' \ 'e42f3acbe85b6098af75c5cecc9a254baaa0482c') build() { - Fcd $_F_archive_name-${pkgver/_/-} + Fcd ImageMagick-${pkgver/_/-} # Modifications because bugy Makefile Fsed "Magick++-config.1" "Magick++-config" {Makefile.in,scripts/Makefile.am} cp {ChangeLog,NEWS.txt} Magick++/ || Fdie diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index 9a7550c..20d34e4 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -9,17 +9,17 @@ _F_archive_name=MPlayer pkgver=1.0rc2 Fuse $USE_DEVEL && pkgver=1.0rc2.29962 pkgextraver=.29962 -pkgrel=17 +pkgrel=16 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/"; -depends=('libgl' 'fontconfig' 'libstdc++' 'ncurses' 'libdv' 'libmad' \ - 'libgif' 'libjpeg>=8a' 'libpng>=1.4.1' 'xvidcore' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \ +depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \ + 'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \ 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2>=2.16.2-2' \ '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') +makedepends=('gcc=4.4.2') groups=('xapps') backup=('etc/mplayer/mplayer.conf') archs=('i686' 'x86_64' 'ppc') @@ -51,7 +51,7 @@ fi subpkgs=('mencoder') subdescs=('The Movie Encoder') -subdepends=('x264 lame libpng libjpeg libgif alsa-lib cdparanoia fontconfig lzo libmad libtheora libstdc++ opencore-amr libdv xvidcore libxcb') +subdepends=('x264 lame libpng libjpeg libungif alsa-lib cdparanoia fontconfig lzo libmad libtheora libstdc++ opencore-amr libdv xvidcore libxcb') [ "$CARCH" != "ppc" ] && subdepends[0]="${subdepends[0]} liblirc" subgroups=('xmultimedia') subarchs=('i686 x86_64 ppc') diff --git a/source/xlib-extra/cegui/FrugalBuild b/source/xlib-extra/cegui/FrugalBuild index 10ef764..457cbad 100644 --- a/source/xlib-extra/cegui/FrugalBuild +++ b/source/xlib-extra/cegui/FrugalBuild @@ -2,18 +2,19 @@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=cegui -pkgver=0.7.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Crazy Eddie's GUI System is a free library providing windowing and widgets for graphics APIs/engines" -depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' 'libxml2' 'silly>=0.1.0-2') +depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' 'libxml2' 'silly') groups=('xlib-extra') archs=('i686' 'x86_64') -_F_sourceforge_name="CEGUI" _F_sourceforge_dirname="crayzedsgui" _F_sourceforge_ext=".tar.gz" Finclude sourceforge url="http://www.cegui.org.uk/"; +source=(${source/$pkgname-/CEGUI-} compile-fix-for-xerces-c-2.8.0.patch) _F_cd_path="CEGUI-`echo $pkgver | sed 's/b//'`" Fconfopts="${Fconfopts} --without-devil --with-default-image-codec=SILLYImageCodec" -sha1sums=('c27969d8a72a7ed13fbb386cb21a387de7929b09') +sha1sums=('3b096bfffef23b9e83a400be7f4dbcb2482432ff' \ + '817dee3f9b83588cad27da5ae86ec323ab21b1ee') # optimization OK diff --git a/source/xlib-extra/gnash/FrugalBuild b/source/xlib-extra/gnash/FrugalBuild index 08e7675..96436de 100644 --- a/source/xlib-extra/gnash/FrugalBuild +++ b/source/xlib-extra/gnash/FrugalBuild @@ -4,17 +4,17 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=gnash -pkgver=0.8.7 +pkgver=0.8.5 Fuse $USE_DEVEL && pkgver=bzr9976 -pkgrel=1 +pkgrel=2 pkgdesc="A GNU Flash movie player." url="http://www.gnu.org/software/gnash/"; -depends=('sdl_mixer' 'cairo>=1.8.6-3' 'libgif' 'libjpeg' 'libxml2' 'libmad' 'boost' 'agg' 'curl' \ - 'gtkglext>=1.2.0-5' 'libboost-mt>=1.37.0' 'gstreamer') +depends=('sdl_mixer' 'cairo>=1.8.6-3' 'libjpeg' 'libxml2' 'libmad' 'boost' 'agg' 'curl' \ + 'gtkglext>=1.2.0-5' 'libboost-mt>=1.37.0' 'gstreamer' 'libungif') makedepends=('boost') groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') -up2date="Flasttar http://ftp.gnu.org/pub/gnu/gnash/"; +up2date="lynx -dump http://ftp.gnu.org/pub/gnu/gnash/|grep [0-9]/$|sed -n 's|.*/\(.*\)/$|\1|;$ p'" if ! Fuse $USE_DEVEL; then source=(http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.bz2) @@ -25,9 +25,6 @@ else Finclude scm fi -#Finclude autodeps -#autodeps - # test page: http://www.4kids.org/funstuff/music/ build() diff --git a/source/xlib/djvulibre/FrugalBuild b/source/xlib/djvulibre/FrugalBuild index e533c51..1075af5 100644 --- a/source/xlib/djvulibre/FrugalBuild +++ b/source/xlib/djvulibre/FrugalBuild @@ -3,9 +3,9 @@ pkgname=djvulibre pkgver=3.5.21 -pkgrel=2 +pkgrel=1 pkgdesc="DjVu is a web-centric format for distributing documents and images." -depends=('libtiff' 'libjpeg>=8a') +depends=('libtiff' 'libjpeg') makedepends=('kdelibs' 'gnome-mime-data' 'gnome-icon-theme' 'htop' 'xdg-utils') rodepends=('xdg-utils') groups=('xlib')
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
